public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'export-dashboard'

Browse Source 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js
This commit is contained in:
Torkel Ödegaard
2016-06-16 08:06:43 +02:00
parent 4b78ab5bcd c8965d0f9a
commit ec0b09450c
66 changed files with 1906 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/sample.ini
+5 -1
View File
@@ -294,6 +294,7 @@ check_for_updates = true
;path = /var/lib/grafana/dashboards
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /api/metrics
[metrics]
# Disable / Enable internal metrics
;enabled = true
@@ -306,4 +307,7 @@ check_for_updates = true
; address = localhost:2003
; prefix = prod.grafana.%(instance_name)s.
#################################### Internal Grafana Metrics ##########################
# Url used to to import dashboards directly from Grafana.net
[grafana_net]
url = https://grafana.net