diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c0937a872c..bce9b10f792 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 6e0289e2bd5..cefa8d605d7 100644 --- a/README.md +++ b/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/). diff --git a/build.go b/build.go index 72f7f498d97..8ac7fada898 100644 --- a/build.go +++ b/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, diff --git a/docs/sources/guides/whats-new-in-v2-5.md b/docs/sources/guides/whats-new-in-v2-5.md index 93cdd59cb50..ff80ec1f4f4 100644 --- a/docs/sources/guides/whats-new-in-v2-5.md +++ b/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 - - - -### Download Grafana 2.5 now +### Download Grafana 2.5 now diff --git a/docs/sources/index.md b/docs/sources/index.md index 62e5dac7fa5..f22ee82cc5c 100644 --- a/docs/sources/index.md +++ b/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. diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 607d683bbb2..19d2c87a2b6 100644 --- a/docs/sources/installation/debian.md +++ b/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. diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md index 837de3a2354..47d52817b64 100644 --- a/docs/sources/installation/index.md +++ b/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) diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index d329b7032c4..799e3441b66 100644 --- a/docs/sources/installation/rpm.md +++ b/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. diff --git a/docs/sources/plugins/developing/development.md b/docs/sources/plugins/developing/development.md index 2c2bc445411..1f8db99424b 100644 --- a/docs/sources/plugins/developing/development.md +++ b/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 diff --git a/docs/sources/reference/admin.md b/docs/sources/reference/admin.md index df396fed212..a6863b4ea71 100644 --- a/docs/sources/reference/admin.md +++ b/docs/sources/reference/admin.md @@ -27,7 +27,7 @@ modify Organization details and options. ## Grafana Administrators - + 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. diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go index ad649cb084d..0eb21865b9f 100644 --- a/pkg/services/alerting/notifiers/hipchat.go +++ b/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(), } diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go index 7b2bfd09c9a..0dc88a926c4 100644 --- a/pkg/services/alerting/notifiers/slack.go +++ b/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(), }, }, diff --git a/public/app/plugins/app/testdata/datasource/plugin.json b/public/app/plugins/app/testdata/datasource/plugin.json index 4d66253d78e..80445dfb3bc 100644 --- a/public/app/plugins/app/testdata/datasource/plugin.json +++ b/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": "", diff --git a/public/app/plugins/app/testdata/plugin.json b/public/app/plugins/app/testdata/plugin.json index 1d6264c54c1..3efcd687453 100644 --- a/public/app/plugins/app/testdata/plugin.json +++ b/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" diff --git a/public/app/plugins/datasource/cloudwatch/plugin.json b/public/app/plugins/datasource/cloudwatch/plugin.json index eb2f97335da..bac2ddca8b9 100644 --- a/public/app/plugins/datasource/cloudwatch/plugin.json +++ b/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", diff --git a/public/app/plugins/datasource/elasticsearch/plugin.json b/public/app/plugins/datasource/elasticsearch/plugin.json index 62d6a93b3b0..34a9750ee6b 100644 --- a/public/app/plugins/datasource/elasticsearch/plugin.json +++ b/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": { diff --git a/public/app/plugins/datasource/graphite/plugin.json b/public/app/plugins/datasource/graphite/plugin.json index 76242fd883c..85009cfd294 100644 --- a/public/app/plugins/datasource/graphite/plugin.json +++ b/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", diff --git a/public/app/plugins/datasource/influxdb/plugin.json b/public/app/plugins/datasource/influxdb/plugin.json index 635309d1610..56587f91c78 100644 --- a/public/app/plugins/datasource/influxdb/plugin.json +++ b/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", diff --git a/public/app/plugins/datasource/opentsdb/plugin.json b/public/app/plugins/datasource/opentsdb/plugin.json index 7de072c6948..b2f4503b5ff 100644 --- a/public/app/plugins/datasource/opentsdb/plugin.json +++ b/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", diff --git a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json index 67fa58e68de..23f4226e69f 100644 --- a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json +++ b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json @@ -167,7 +167,7 @@ "valueName": "current" }, { - "content": "\"Prometheus\nPrometheus\n\n

You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the Grafana and Prometheus projects.

", + "content": "\"Prometheus\nPrometheus\n\n

You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the Grafana and Prometheus projects.

", "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", diff --git a/public/app/plugins/datasource/prometheus/plugin.json b/public/app/plugins/datasource/prometheus/plugin.json index 54fd1129b8b..43bb0c53595 100644 --- a/public/app/plugins/datasource/prometheus/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/alertlist/plugin.json b/public/app/plugins/panel/alertlist/plugin.json index 4767eec9e2a..9fd42bc5ed2 100644 --- a/public/app/plugins/panel/alertlist/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/dashlist/plugin.json b/public/app/plugins/panel/dashlist/plugin.json index d46622e5e27..3b8eca5e49d 100644 --- a/public/app/plugins/panel/dashlist/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/gettingstarted/plugin.json b/public/app/plugins/panel/gettingstarted/plugin.json index 106f509281f..1737abdff4c 100644 --- a/public/app/plugins/panel/gettingstarted/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/graph/plugin.json b/public/app/plugins/panel/graph/plugin.json index b2976c27e04..102c7d14e56 100644 --- a/public/app/plugins/panel/graph/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/pluginlist/plugin.json b/public/app/plugins/panel/pluginlist/plugin.json index 72f5ea06d25..0cdc506167c 100644 --- a/public/app/plugins/panel/pluginlist/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/singlestat/plugin.json b/public/app/plugins/panel/singlestat/plugin.json index 197cf3ec27d..8bf45d3b690 100644 --- a/public/app/plugins/panel/singlestat/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/table/plugin.json b/public/app/plugins/panel/table/plugin.json index 84a527db565..c1d2c43b128 100644 --- a/public/app/plugins/panel/table/plugin.json +++ b/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", diff --git a/public/app/plugins/panel/text/plugin.json b/public/app/plugins/panel/text/plugin.json index e63974c6167..9bc604a87bb 100644 --- a/public/app/plugins/panel/text/plugin.json +++ b/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", diff --git a/public/views/index.html b/public/views/index.html index 55fe9408a73..6d5d65e5201 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -49,24 +49,24 @@
  • - + Support Plans
  • - + Community
  • - Grafana + Grafana v[[.BuildVersion]] (commit: [[.BuildCommit]])
    • [[if .NewGrafanaVersionExists]]
  • - + New version available!