more work on refining config loading, and packaging

conf/sample.ini

@@ -1,107 +1,38 @@
+##################### Grafana Configuration Example #####################
+
 # Sample grafana config for deb & rpm packages
 # You only need to specify overrides here
-# Defaults are in the /opt/grafana/current/conf/defaults.ini file
-# This file is never ovewritten when upgrading grafana via deb or rpm package
 
-app_mode = production
+; app_mode = production
 
-; data_path (used for sqlite3 db (if that is used), temp png images, and sessions (if file based sessions are used)
-; this option is passed via command line args, override this option in /etc/default/grafana
-; defaults to /opt/grafana/data
-data_path =
+#################################### Paths ####################################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is useD)
+#
+;data = /var/lib/grafana
+#
+# Directory where grafana can store logs
+#
+;logs = /var/log/grafana
 
 [server]
 ; protocol (http or https)
-protocol = http
+;protocol = http
 ; the ip address to bind to, empty will bind to all interfaces
-http_addr =
+;http_addr =
 ; the http port  to use
-http_port = 3000
+;http_port = 3000
 ; The public facing domain name used to access grafana from a browser
-domain = localhost
+;domain = localhost
 ; the full public facing url
-root_url = %(protocol)s://%(domain)s:%(http_port)s/
-router_logging = false
-; the path relative to grafana process working directory
-static_root_path = public
-enable_gzip = false
+;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+;router_logging = false
+; the path relative home path where frontend assets are located
+;static_root_path = public
+; enable gzip
+;enable_gzip = false
 ; https certs & key file
-cert_file =
-cert_key =
+;cert_file =
+;cert_key =
 
-[analytics]
-# Server reporting, sends usage counters to stats.grafana.org (https).
-# No ip addresses are being tracked, only simple counters to track
-# running instances, dashboard and error counts. It is very helpful to us.
-# Change this option to false to disable reporting.
-reporting_enabled = true
-; Google Analytics universal tracking code, only enabled if you specify an id here
-google_analytics_ua_id =
-
-[database]
-; Either "mysql", "postgres" or "sqlite3", it's your choice
-type = sqlite3
-host = 127.0.0.1:3306
-name = grafana
-user = root
-password =
-; For "postgres" only, either "disable", "require" or "verify-full"
-ssl_mode = disable
-; For "sqlite3" only, path is relative to data_dir
-path = grafana.db
-
-[session]
-; Either "memory", "file", "redis", "mysql", default is "memory"
-provider = file
-; Provider config options
-; memory: not have any config yet
-; file: session file path, e.g. `sessions`, relative to data_dir
-; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana`
-; mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name`
-provider_config = sessions
-; Session cookie name
-cookie_name = grafana_sess
-; If you use session in https only, default is false
-cookie_secure = false
-; Session life time, default is 86400
-session_life_time = 86400
-
-[security]
-; default admin user, created on startup
-admin_user = admin
-; default admin password, can be changed before first start of grafana,  or in profile settings
-admin_password = admin
-; used for signing
-secret_key = SW2YcwTIb9zpOOhoPsMm
-; Auto-login remember days
-login_remember_days = 7
-cookie_username = grafana_user
-cookie_remember_name = grafana_remember
-
-[users]
-; disable user signup / registration
-allow_sign_up = true
-; Allow non admin users to create organizations
-allow_org_create = true
-# Set to true to automatically assign new users to the default organization (id 1)
-auto_assign_org = true
-; Default role new users will be automatically assigned (if disabled above is set to true)
-auto_assign_org_role = Viewer
-
-[auth.anonymous]
-; enable anonymous access
-enabled = false
-; specify organization name that should be used for unauthenticated users
-org_name = Main org.
-; specify role for unauthenticated users
-org_role = Viewer
-
-[log]
-; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
-level = Info
-mode = console, file
-; root_path, this option is passed via command line args,
-; override this option in /etc/default/grafana
-; defaults to /var/log/grafana/
-root_path =