diff --git a/conf/defaults.ini b/conf/defaults.ini index d8b53b167ca..9f2c9ed6de3 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -132,11 +132,11 @@ logging = false # Change this option to false to disable reporting. reporting_enabled = true -# Set to false to disable all checks to https://grafana.net +# Set to false to disable all checks to https://grafana.com # for new vesions (grafana itself and plugins), check is used # in some UI views to notify that grafana or plugin update exists # This option does not cause any auto updates, nor send any information -# only a GET request to http://grafana.net to get latest versions +# only a GET request to https://grafana.com to get latest versions check_for_updates = true # Google Analytics universal tracking code, only enabled if you specify an id here @@ -243,7 +243,7 @@ api_url = https://www.googleapis.com/oauth2/v1/userinfo allowed_domains = hosted_domain = -#################################### Grafana.net Auth #################### +#################################### Grafana.com Auth #################### [auth.grafananet] enabled = false allow_sign_up = true @@ -426,7 +426,7 @@ address = prefix = prod.grafana.%(instance_name)s. [grafana_net] -url = https://grafana.net +url = https://grafana.com #################################### External Image Storage ############## [external_image_storage] diff --git a/conf/sample.ini b/conf/sample.ini index 969c64cb036..3b7415e4217 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -129,7 +129,7 @@ # for new vesions (grafana itself and plugins), check is used # in some UI views to notify that grafana or plugin update exists # This option does not cause any auto updates, nor send any information -# only a GET request to http://grafana.net to get latest versions +# only a GET request to http://grafana.com to get latest versions ;check_for_updates = true # Google Analytics universal tracking code, only enabled if you specify an id here @@ -243,7 +243,7 @@ ;team_ids = ;allowed_organizations = -#################################### Grafana.net Auth #################### +#################################### Grafana.com Auth #################### [auth.grafananet] ;enabled = false ;allow_sign_up = true @@ -379,10 +379,10 @@ ;address = ;prefix = prod.grafana.%(instance_name)s. -#################################### Internal Grafana Metrics ########################## -# Url used to to import dashboards directly from Grafana.net +#################################### Grafana.com integration ########################## +# Url used to to import dashboards directly from Grafana.com [grafana_net] -;url = https://grafana.net +;url = https://grafana.com #################################### External image storage ########################## [external_image_storage] diff --git a/docs/sources/features/datasources/index.md b/docs/sources/features/datasources/index.md index fcef3370455..16a8578ed3e 100644 --- a/docs/sources/features/datasources/index.md +++ b/docs/sources/features/datasources/index.md @@ -30,5 +30,5 @@ The following datasources are officially supported: ## Data source plugins -Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.net/plugins) for more data sources. +Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.com/plugins) for more data sources. diff --git a/docs/sources/guides/whats-new-in-v3-1.md b/docs/sources/guides/whats-new-in-v3-1.md index 3f1c25eb937..1e8ef87297b 100644 --- a/docs/sources/guides/whats-new-in-v3-1.md +++ b/docs/sources/guides/whats-new-in-v3-1.md @@ -26,7 +26,7 @@ select data source and optional metrix prefix options. The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard. -One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net). +One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.com](https://grafana.com). The next step in the import process: @@ -37,9 +37,9 @@ shows a CollectD dashboard for Graphite that requires a metric prefix be specifi ## Discover Dashboards -On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but +On [Grafana.com](https://grafana.com) you can now browse & search for dashboards. We have already added a few but more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana, -then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL. +then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL. diff --git a/docs/sources/guides/whats-new-in-v3.md b/docs/sources/guides/whats-new-in-v3.md index fd4d1e40a18..d82a833ec90 100644 --- a/docs/sources/guides/whats-new-in-v3.md +++ b/docs/sources/guides/whats-new-in-v3.md @@ -14,7 +14,7 @@ weight = 6 ## Commercial Support -Commercial Support subscriptions for Grafana are now [generally available](https://grafana.net/support/plans/). +Commercial Support subscriptions for Grafana are now [generally available](https://grafana.com/support/plans/). Raintank is committed to a 100% open-source strategy for Grafana. We do not want to go down the “open core” route. If your organization @@ -41,15 +41,15 @@ two new plugin types: Dashboards, and Grafana **Pages**. Apps are a great way to provide an entire experience right within Grafana. -## Grafana.net +## Grafana.com -[Grafana.net](https://grafana.net) offers a central repository where the community can come together to discover, create and +[Grafana.com](https://grafana.com) offers a central repository where the community can come together to discover, create and share plugins (data sources, panels, apps) and dashboards. We are also working on a hosted Graphite-compatible data source that will be optimized for use with Grafana. -It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.net can +It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.com can also be a hub to manage all your Grafana instances. You’ll be able to monitor their health and availability, perform dashboard backups, and more. @@ -57,12 +57,12 @@ We are also working on a hosted Graphite-compatible Data Source that will be optimized for use with Grafana. It’ll be easy to combine your existing Data Source(s) with this OpenSaaS option. -Finally, Grafana.net will also be a hub to manage all your Grafana +Finally, Grafana.com will also be a hub to manage all your Grafana instances. You’ll be able to monitor their health and availability, perform Dashboard backups, and more. Grafana.net will officially launch along with the stable version of -Grafana 3.0, but check out the preview +Grafana 3.0, but go to and check out the preview and sign up for an account in the meantime. @@ -189,37 +189,37 @@ variable is interpolated. data source (or panel) they need to be updated as well. * InfluxDB 0.8: This data source is no longer included in releases, -you can still install manually from [Grafana.net](http://grafana.net) +you can still install manually from [Grafana.com](https://grafana.com) * KairosDB: This data source has also no longer shipped with Grafana, -you can install it manually from [Grafana.net](http://grafana.net) +you can install it manually from [Grafana.com](https://grafana.com) ## Plugin showcase -Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.net](https://grafana.net). Here +Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.com](https://grafana.com). Here are a couple that I incurage you try! -#### [Clock Panel](https://grafana.net/plugins/grafana-clock-panel) +#### [Clock Panel](https://grafana.com/plugins/grafana-clock-panel) Support's both current time and count down mode. -#### [Pie Chart Panel](https://grafana.net/plugins/grafana-piechart-panel) +#### [Pie Chart Panel](https://grafana.com/plugins/grafana-piechart-panel) A simple pie chart panel is now available as an external plugin. -#### [WorldPing App](https://grafana.net/plugins/raintank-worldping-app) +#### [WorldPing App](https://grafana.com/plugins/raintank-worldping-app) This is full blown Grafana App that adds new panels, data sources and pages to give feature rich global performance monitoring directly from your on-prem Grafana. -#### [Zabbix App](https://grafana.net/plugins/alexanderzobnin-zabbix-app) +#### [Zabbix App](https://grafana.com/plugins/alexanderzobnin-zabbix-app) This app contains the already very pouplar Zabbix data source plugin, 2 dashboards and a triggers panel. It is created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/grafana-zabbix). -Checkout the full list of plugins on [Grafana.net](https://grafana.net/plugins) +Checkout the full list of plugins on [Grafana.com](https://grafana.com/plugins) ## CHANGELOG diff --git a/docs/sources/plugins/developing/code-styleguide.md b/docs/sources/plugins/developing/code-styleguide.md index 99d9f565c7d..44379c4d4e5 100644 --- a/docs/sources/plugins/developing/code-styleguide.md +++ b/docs/sources/plugins/developing/code-styleguide.md @@ -13,7 +13,7 @@ This guide has two parts. The first part describes the metadata and the second p ## Metadata -The plugin metadata consists of a plugin.json file and the README.md file. These two files are used by Grafana and Grafana.net. +The plugin metadata consists of a plugin.json file and the README.md file. These two files are used by Grafana and Grafana.com. ### Plugin.json (mandatory) diff --git a/docs/sources/plugins/developing/plugin.json.md b/docs/sources/plugins/developing/plugin.json.md index 8d94ca93af5..7de5e91986f 100644 --- a/docs/sources/plugins/developing/plugin.json.md +++ b/docs/sources/plugins/developing/plugin.json.md @@ -19,7 +19,7 @@ The plugin.json file is mandatory for all plugins. When Grafana starts it will s | id | unique name of the plugin - [conventions described in styleguide]({{< relref "code-styleguide.md" >}}) | | type | panel/datasource/app | | name | Human readable name of the plugin | -| info.description | Description of plugin. Used for searching grafana net plugins | +| info.description | Description of plugin. Used for searching grafana.com plugins | | info.author | | | info.keywords | plugin keywords. Used for search on grafana net| | info.logos | link to project logos | diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md index 5880d18c0e3..745d7ce2304 100644 --- a/docs/sources/plugins/installation.md +++ b/docs/sources/plugins/installation.md @@ -17,7 +17,7 @@ Grafana already have a strong community of contributors and plugin developers. By making it easier to develop and install plugins we hope that the community can grow even stronger and develop new plugins that we would never think about. -To discover plugins checkout the official [Plugin Repository](https://grafana.net/plugins). +To discover plugins checkout the official [Plugin Repository](https://grafana.com/plugins). # Installing plugins diff --git a/docs/sources/reference/export_import.md b/docs/sources/reference/export_import.md index bc05795c030..4c2d5faa3d3 100644 --- a/docs/sources/reference/export_import.md +++ b/docs/sources/reference/export_import.md @@ -33,7 +33,7 @@ To import a dashboard open dashboard search and then hit the import button. -From here you can upload a dashboard json file, paste a [Grafana.net](https://grafana.net) dashboard +From here you can upload a dashboard json file, paste a [Grafana.com](https://grafana.com) dashboard url or paste dashboard json text directly into the text area. @@ -41,15 +41,15 @@ url or paste dashboard json text directly into the text area. In step 2 of the import process Grafana will let you change the name of the dashboard, pick what data source you want the dashboard to use and specify any metric prefixes (if the dashboard use any). -## Discover dashboards on Grafana.net +## Discover dashboards on Grafana.com -Find dashboards for common server applications at [Grafana.net/dashboards](https://grafana.net/dashboards). +Find dashboards for common server applications at [Grafana.com/dashboards](https://grafana.com/dashboards). ## Import & Sharing with Grafana 2.x or 3.0 -Dashboards on Grafana.net use a new feature in Grafana 3.1 that allows the import process +Dashboards on Grafana.com use a new feature in Grafana 3.1 that allows the import process to update each panel so that they are using a data source of your choosing. If you are running a Grafana version older than 3.1 then you might need to do some manual steps either before or after import in order for the dashboard to work properly. @@ -99,10 +99,10 @@ These are then referenced in the dashboard panels like this: ``` These inputs and their usage in data source properties are automatically added during export in Grafana 3.1. -If you run an older version of Grafana and want to share a dashboard on Grafana.net you need to manually +If you run an older version of Grafana and want to share a dashboard on Grafana.com you need to manually add the inputs and templatize the datasource properties like above. -If you want to import a dashboard from Grafana.net into an older version of Grafana then you can either import +If you want to import a dashboard from Grafana.com into an older version of Grafana then you can either import it as usual and then update the data source option in the metrics tab so that the panel is using the correct data source. Another alternative is to open the json file in a a text editor and update the data source properties to value that matches a name of your data source. diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go index 658edd0f895..e586e606fb5 100644 --- a/pkg/cmd/grafana-cli/main.go +++ b/pkg/cmd/grafana-cli/main.go @@ -35,7 +35,7 @@ func main() { cli.StringFlag{ Name: "repo", Usage: "url to the plugin repository", - Value: "https://grafana.net/api/plugins", + Value: "https://grafana.com/api/plugins", EnvVar: "GF_PLUGIN_REPO", }, cli.BoolFlag{ diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go index 76c566803ac..a2594ad915a 100644 --- a/pkg/plugins/update_checker.go +++ b/pkg/plugins/update_checker.go @@ -60,7 +60,7 @@ func checkForUpdates() { log.Trace("Checking for updates") pluginSlugs := getAllExternalPluginSlugs() - resp, err := httpClient.Get("https://grafana.net/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion) + resp, err := httpClient.Get("https://grafana.com/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion) if err != nil { log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error()) @@ -71,14 +71,14 @@ func checkForUpdates() { body, err := ioutil.ReadAll(resp.Body) if err != nil { - log.Trace("Update check failed, reading response from grafana.net, %v", err.Error()) + log.Trace("Update check failed, reading response from grafana.com, %v", err.Error()) return } gNetPlugins := []GrafanaNetPlugin{} err = json.Unmarshal(body, &gNetPlugins) if err != nil { - log.Trace("Failed to unmarshal plugin repo, reading response from grafana.net, %v", err.Error()) + log.Trace("Failed to unmarshal plugin repo, reading response from grafana.com, %v", err.Error()) return } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index a5f46170db5..99390ecc1c9 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -574,7 +574,7 @@ func NewConfigContext(args *CommandLineArgs) error { log.Warn("require_email_validation is enabled but smpt is disabled") } - GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.net") + GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.com") imageUploadingSection := Cfg.Section("external_image_storage") ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal") diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index cc021bb69ed..91959114216 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -68,7 +68,7 @@ Import - + Find dashboards on diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index 7cb22c756cd..7deb46931c2 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -50,7 +50,7 @@
  • Export -
    Export the dashboard to a JSON file for others and to share on Grafana.net
    +
    Export the dashboard to a JSON file for others and to share on Grafana.com
    • diff --git a/public/app/features/dashboard/export/export_modal.html b/public/app/features/dashboard/export/export_modal.html index e890e405020..8533a4beea0 100644 --- a/public/app/features/dashboard/export/export_modal.html +++ b/public/app/features/dashboard/export/export_modal.html @@ -12,7 +12,7 @@

    Export the dashboard to a JSON file. The exporter will templatize the dashboard's data sources to make it easy for other's to to import and reuse. - You can share dashboards on Grafana.net + You can share dashboards on Grafana.com

    diff --git a/public/app/features/dashboard/import/dash_import.html b/public/app/features/dashboard/import/dash_import.html index 5e19a02c28c..8a42d64c0c5 100644 --- a/public/app/features/dashboard/import/dash_import.html +++ b/public/app/features/dashboard/import/dash_import.html @@ -18,11 +18,11 @@ -
    Grafana.net Dashboard
    +
    Grafana.com Dashboard
    - +
    diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 6ef9c3b1501..1e457a99b71 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -60,7 +60,7 @@ with GitHub - with Grafana.net + with Grafana.com diff --git a/public/app/plugins/datasource/influxdb/README.md b/public/app/plugins/datasource/influxdb/README.md index d8d98cf5c6b..aca126db36c 100644 --- a/public/app/plugins/datasource/influxdb/README.md +++ b/public/app/plugins/datasource/influxdb/README.md @@ -1,12 +1,12 @@ # InfluxDB Datasource - Native Plugin -Grafana ships with **built in** support for InfluxDB 0.9. +Grafana ships with **built in** support for InfluxDB 0.9. There are currently two separate datasources for InfluxDB in Grafana: InfluxDB 0.8.x and InfluxDB 0.9.x. The API and capabilities of InfluxDB 0.9.x are completely different from InfluxDB 0.8.x which is why Grafana handles them as different data sources. -This is the plugin for InfluxDB 0.9. It is rapidly evolving and we continue to track its API. +This is the plugin for InfluxDB 0.9. It is rapidly evolving and we continue to track its API. -InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users. You can find it [here](https://grafana.net/plugins/grafana-influxdb-08-datasource). +InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users. You can find it [here](https://grafana.com/plugins/grafana-influxdb-08-datasource). Read more about InfluxDB here: diff --git a/public/app/plugins/panel/gettingstarted/module.ts b/public/app/plugins/panel/gettingstarted/module.ts index 9e19cce1063..4ebc76f942e 100644 --- a/public/app/plugins/panel/gettingstarted/module.ts +++ b/public/app/plugins/panel/gettingstarted/module.ts @@ -69,7 +69,7 @@ class GettingStartedPanelCtrl extends PanelCtrl { title: 'Install apps & plugins', cta: 'Explore plugin repository', icon: 'icon-gf icon-gf-apps', - href: 'https://grafana.net/plugins?utm_source=grafana_getting_started', + href: 'https://grafana.com/plugins?utm_source=grafana_getting_started', check: () => { return this.backendSrv.get('api/plugins', {embedded: 0, core: 0}).then(plugins => { return plugins.length > 0; diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html index 1cf7cfac34f..1b2792b510c 100644 --- a/public/app/plugins/panel/pluginlist/module.html +++ b/public/app/plugins/panel/pluginlist/module.html @@ -22,7 +22,7 @@
    - + None installed. Browse Grafana.net