update to upstream version 6.7.2, add scripts to ease upgrade process

.gitignore

@@ -1,12 +1,2 @@
-/grafana-6.1.4.tar.gz
+/grafana-*.tar.gz
-/grafana_webpack-6.1.4.tar.gz
+/grafana_webpack-*.tar.gz
-/grafana-6.1.6.tar.gz
-/grafana_webpack-6.1.6.tar.gz
-/grafana-6.2.2.tar.gz
-/grafana_webpack-6.2.2.tar.gz
-/grafana-6.3.5.tar.gz
-/grafana_webpack-6.3.5.tar.gz
-/grafana-6.3.6.tar.gz
-/grafana_webpack-6.3.6.tar.gz
-/grafana-6.6.2.tar.gz
-/grafana_webpack-6.6.2.tar.gz

000-set-version-string.patch

@@ -1,15 +0,0 @@
-diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
-index 14d6036e82..d2e61564f2 100644
---- a/pkg/cmd/grafana-server/main.go
-+++ b/pkg/cmd/grafana-server/main.go
-@@ -32,8 +32,8 @@ import (
- 	_ "github.com/grafana/grafana/pkg/tsdb/testdatasource"
- )
- 
--var version = "5.0.0"
--var commit = "NA"
-+var version = "6.6.2"
-+var commit = "3fa63cfc34668781c7f9b3caafe6d9d400b06b7f"
- var buildBranch = "master"
- var buildstamp string
- 

003-manpages.patch

@@ -0,0 +1,219 @@
+diff --git a/docs/man/man1/grafana-cli.1 b/docs/man/man1/grafana-cli.1
+new file mode 100644
+index 0000000000..171748fcda
+--- /dev/null
++++ b/docs/man/man1/grafana-cli.1
+@@ -0,0 +1,51 @@
++.TH GRAFANA "1" "February 2019" "Grafana cli version 5.4.3" "User Commands"
++.SH NAME
++grafana-cli \- command line administration for the Grafana metrics dashboard and graph editor
++.SH DESCRIPTION
++.SS "NAME:"
++.IP
++grafana-cli
++.SS "USAGE:"
++.IP
++\fBgrafana\-cli\fP [\fIglobal options\fP] \fIcommand\fP [\fIcommand options\fP] [\fIarguments\fP...]
++.SS "COMMANDS:"
++.TP
++plugins
++Manage plugins for grafana
++.TP
++admin
++Grafana admin commands
++.TP
++help, h
++Shows a list of commands or help for one command
++.SS "GLOBAL OPTIONS:"
++.TP
++\fB\-\-pluginsDir\fR value
++path to the grafana plugin directory (default: "/var/lib/grafana/plugins") [$GF_PLUGIN_DIR]
++.TP
++\fB\-\-repo\fR value
++url to the plugin repository (default: "https://grafana.com/api/plugins") [$GF_PLUGIN_REPO]
++.TP
++\fB\-\-pluginUrl\fR value
++Full url to the plugin zip file instead of downloading the plugin from grafana.com/api [$GF_PLUGIN_URL]
++.TP
++\fB\-\-insecure\fR
++Skip TLS verification (insecure)
++.TP
++\fB\-\-debug\fR, \fB\-d\fR
++enable debug logging
++.TP
++\fB\-\-help\fR, \fB\-h\fR
++show help
++.TP
++\fB\-\-version\fR, \fB\-v\fR
++print the version
++.SH "SEE ALSO"
++Additional documentation for
++.B grafana-cli
++is available on-line at
++.BR http://docs.grafana.org/administration/cli/ .
++The full documentation for
++.B Grafana
++is available on-line at
++.BR http://docs.grafana.org/ .
+diff --git a/docs/man/man1/grafana-server.1 b/docs/man/man1/grafana-server.1
+new file mode 100644
+index 0000000000..30b7c1306f
+--- /dev/null
++++ b/docs/man/man1/grafana-server.1
+@@ -0,0 +1,156 @@
++.TH VERSION "1" "February 2019" "Version 5.4.3" "User Commands"
++.SH NAME
++grafana-server \- back-end server for the Grafana metrics dashboard and graph editor
++.SH DESCRIPTION
++.B grafana-server
++is the back-end server for the Grafana metrics dashboard and graph editor.
++The
++.B grafana-server
++program should not normally be run from the command line,
++except when testing or for development purposes.
++Rather it should be managed by
++.BR systemd .
++After installing Grafana, the systemd service should be enabled and started as follows:
++.P
++.in 1i
++.B systemctl daemon-reload
++.br
++.B systemctl enable grafana-server.service
++.br
++.B systemctl start grafana-server.service
++.in
++.P
++.SH OPTIONS
++The
++.B gafana-server
++configuration is specified in
++.BR /etc/grafana/grafana.ini
++and is well documented with comments.
++The command-line options listed below override options of
++the same (or similar) name in the configuration file and also provide
++additional options for testing Grafana.
++.P
++.HP
++\fB\-config\fR string
++.IP
++path to config file
++.HP
++\fB\-homepath\fR string
++.IP
++path to grafana install/home path, defaults to working directory
++.HP
++\fB\-packaging\fR string
++.IP
++describes the way Grafana was installed (default "unknown")
++.HP
++\fB\-pidfile\fR string
++.IP
++path to pid file
++.HP
++\fB\-profile\fR
++.IP
++Turn on pprof profiling
++.HP
++\fB\-profile\-port\fR int
++.IP
++Define custom port for profiling (default 6060)
++.HP
++\fB\-test\fR.bench regexp
++.IP
++run only benchmarks matching regexp
++.HP
++\fB\-test\fR.benchmem
++.IP
++print memory allocations for benchmarks
++.HP
++\fB\-test\fR.benchtime d
++.IP
++run each benchmark for duration d (default 1s)
++.HP
++\fB\-test\fR.blockprofile file
++.IP
++write a goroutine blocking profile to file
++.HP
++\fB\-test\fR.blockprofilerate rate
++.IP
++set blocking profile rate (see runtime.SetBlockProfileRate) (default 1)
++.HP
++\fB\-test\fR.count n
++.IP
++run tests and benchmarks n times (default 1)
++.HP
++\fB\-test\fR.coverprofile file
++.IP
++write a coverage profile to file
++.HP
++\fB\-test\fR.cpu list
++.IP
++comma\-separated list of cpu counts to run each test with
++.HP
++\fB\-test\fR.cpuprofile file
++.IP
++write a cpu profile to file
++.HP
++\fB\-test\fR.failfast
++.IP
++do not start new tests after the first test failure
++.HP
++\fB\-test\fR.list regexp
++.IP
++list tests, examples, and benchmarks matching regexp then exit
++.HP
++\fB\-test\fR.memprofile file
++.IP
++write a memory profile to file
++.HP
++\fB\-test\fR.memprofilerate rate
++.IP
++set memory profiling rate (see runtime.MemProfileRate)
++.HP
++\fB\-test\fR.mutexprofile string
++.IP
++write a mutex contention profile to the named file after execution
++.HP
++\fB\-test\fR.mutexprofilefraction int
++.IP
++if >= 0, calls runtime.SetMutexProfileFraction() (default 1)
++.HP
++\fB\-test\fR.outputdir dir
++.IP
++write profiles to dir
++.HP
++\fB\-test\fR.parallel n
++.IP
++run at most n tests in parallel (default 8)
++.HP
++\fB\-test\fR.run regexp
++.IP
++run only tests and examples matching regexp
++.HP
++\fB\-test\fR.short
++.IP
++run smaller test suite to save time
++.HP
++\fB\-test\fR.testlogfile file
++.IP
++write test action log to file (for use only by cmd/go)
++.HP
++\fB\-test\fR.timeout d
++.IP
++panic test binary after duration d (default 0, timeout disabled)
++.HP
++\fB\-test\fR.trace file
++.IP
++write an execution trace to file
++.HP
++\fB\-test\fR.v
++.IP
++verbose: print additional output
++.TP
++\fB\-v\fR
++prints current version and exits
++.SH "SEE ALSO"
++The full documentation for
++.B Grafana
++is available on-line at
++.BR http://docs.grafana.org/ .

008-pkg-services-notifications-codes-Unknwon.patch

@@ -9,5 +9,5 @@ index ae66aa1d1b..bfb95560fe 100644
 -	"github.com/unknwon/com"
 +	"github.com/Unknwon/com"
  
- 	m "github.com/grafana/grafana/pkg/models"
+ 	"github.com/grafana/grafana/pkg/models"
  	"github.com/grafana/grafana/pkg/setting"

009-pkg-fix-xorm-import.patch

@@ -3,8 +3,8 @@ index c84f6bb948..414e343a63 100644
 --- a/pkg/services/sqlstore/datasource.go
 +++ b/pkg/services/sqlstore/datasource.go
 @@ -5,7 +5,7 @@ import (
- 
  	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/models"
  
 -	"github.com/go-xorm/xorm"
 +	"xorm.io/xorm"
@@ -138,7 +138,7 @@ index 8372898c35..a306badd82 100644
  
 -	"github.com/go-xorm/xorm"
 +	"xorm.io/xorm"
- 	sqlite3 "github.com/mattn/go-sqlite3"
+ 	"github.com/mattn/go-sqlite3"
  )
  
 diff --git a/pkg/services/sqlstore/migrator/types.go b/pkg/services/sqlstore/migrator/types.go

README.md

@@ -1,3 +1,16 @@
 # grafana
+The grafana package
 
-The grafana package
+## Upgrade instructions
+(replace X.Y.Z with the new Grafana version)
+
+* update `Version`, `commit` and `%changelog` in the specfile
+* download source tarball and create webpack: `./make_grafana_webpack.sh X.Y.Z`
+* update golang buildrequires: `./scripts/list_go_buildrequires.sh grafana-X.Y.Z` and replace the old golang `BuildRequires:` with the new ones
+* update nodejs provides: `./scripts/list_bundled_nodejs_packages.py grafana-X.Y.Z` and replace the old nodejs `Provides:` with the new ones
+* check if the default configuration has changed: `diff grafana-X.Y.Z/conf/defaults.ini distro-defaults.ini` and update `distro-defaults.ini` if necessary
+* install all new golang build dependencies: `sudo dnf builddep grafana.spec` and create packages for missing dependencies
+* run local build: `rpkg local`, and if any patches fail, update them accordingly
+* run rpm linter: `rpkg lint`
+* run local builds with different OS versions: `./scripts/run_container_build.sh version` (place not yet published dependencies in the `deps/` directory)
+* run a scratch build: `fedpkg scratch-build --srpm`

distro-defaults.ini

@@ -0,0 +1,724 @@
+##################### Grafana Configuration Defaults for distros #####################
+#
+# Do not modify this file in grafana installs
+#
+
+# possible values : production, development
+app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+instance_name = ${HOSTNAME}
+
+#################################### Paths ###############################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+data = /var/lib/grafana
+
+# Temporary files in `data` directory older than given duration will be removed
+temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+logs = /var/log/grafana
+
+# Directory where grafana will automatically scan and look for plugins
+plugins = /var/lib/grafana/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+provisioning = conf/provisioning
+
+#################################### Server ##############################
+[server]
+# Protocol (http, https, h2, socket)
+protocol = http
+
+# The ip address to bind to, empty will bind to all interfaces
+http_addr =
+
+# The http port to use
+http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+enforce_domain = false
+
+# The full public facing url
+root_url = %(protocol)s://%(domain)s:%(http_port)s/
+
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+serve_from_sub_path = false
+
+# Log web requests
+router_logging = false
+
+# the path relative working path
+static_root_path = public
+
+# enable gzip
+enable_gzip = false
+
+# https certs & key file
+cert_file =
+cert_key =
+
+# Unix socket path
+socket = /tmp/grafana.sock
+
+#################################### Database ############################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url property.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+type = sqlite3
+host = 127.0.0.1:3306
+name = grafana
+user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+password =
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+url =
+
+# Max idle conn setting default is 2
+max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+log_queries =
+
+# For "postgres", use either "disable", "require" or "verify-full"
+# For "mysql", use either "true", "false", or "skip-verify".
+ssl_mode = disable
+
+ca_cert_path =
+client_key_path =
+client_cert_path =
+server_cert_name =
+
+# For "sqlite3" only, path relative to data_path setting
+path = grafana.db
+
+# For "sqlite3" only. cache mode setting used for connecting to the database
+cache_mode = private
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# memcache: 127.0.0.1:11211
+connstr =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+logging = false
+
+# How long the data proxy should wait before timing out default is 30 (seconds)
+timeout = 30
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+send_user_header = false
+
+#################################### Analytics ###########################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# 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 = false
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions (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 https://grafana.com to get latest versions
+check_for_updates = false
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+google_analytics_ua_id =
+
+# Google Tag Manager ID, only enabled if you specify an id here
+google_tag_manager_id =
+
+#################################### Security ############################
+[security]
+# disable creation of admin user on first start of grafana
+disable_initial_admin_creation = false
+
+# 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
+
+# disable gravatar profile images
+disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
+cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+allow_embedding = false
+
+# Set to true if you want to enable http strict transport security (HSTS) response header.
+# This is only sent when HTTPS is enabled in this configuration.
+# HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default will change to true in the next minor release, 6.3.
+strict_transport_security = false
+
+# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
+strict_transport_security_max_age_seconds = 86400
+
+# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
+strict_transport_security_preload = false
+
+# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
+strict_transport_security_subdomains = false
+
+# Set to true to enable the X-Content-Type-Options response header.
+# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+x_content_type_options = false
+
+# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+x_xss_protection = false
+
+
+#################################### Snapshots ###########################
+[snapshots]
+# snapshot sharing options
+external_enabled = false
+external_snapshot_url = https://snapshots-origin.raintank.io
+external_snapshot_name = Publish to snapshot.raintank.io
+
+# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
+# creating and deleting snapshots.
+public_mode = false
+
+# remove expired snapshot
+snapshot_remove_expired = true
+
+#################################### Dashboards ##################
+
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+versions_to_keep = 20
+
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is not set/unrestricted.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+min_refresh_interval =
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+allow_sign_up = false
+
+# Allow non admin users to create organizations
+allow_org_create = false
+
+# Set to true to automatically assign new users to the default organization (id 1)
+auto_assign_org = true
+
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+auto_assign_org_id = 1
+
+# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
+auto_assign_org_role = Viewer
+
+# Require email validation before sign up completes
+verify_email_enabled = false
+
+# Background text for the user field on the login page
+login_hint = email or username
+password_hint = password
+
+# Default UI theme ("dark" or "light")
+default_theme = dark
+
+# External user management
+external_manage_link_url =
+external_manage_link_name =
+external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+editors_can_admin = false
+
+[auth]
+# Login cookie name
+login_cookie_name = grafana_session
+
+# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
+login_maximum_inactive_lifetime_days = 7
+
+# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
+login_maximum_lifetime_days = 30
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth
+disable_login_form = false
+
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
+disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+oauth_auto_login = false
+
+# limit of api_key seconds to live before expiration
+api_key_max_seconds_to_live = -1
+
+#################################### Anonymous Auth ######################
+[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
+
+#################################### Github Auth #########################
+[auth.github]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email,read:org
+auth_url = https://github.com/login/oauth/authorize
+token_url = https://github.com/login/oauth/access_token
+api_url = https://api.github.com/user
+allowed_domains =
+team_ids =
+allowed_organizations =
+
+#################################### GitLab Auth #########################
+[auth.gitlab]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = api
+auth_url = https://gitlab.com/oauth/authorize
+token_url = https://gitlab.com/oauth/token
+api_url = https://gitlab.com/api/v4
+allowed_domains =
+allowed_groups =
+
+#################################### Google Auth #########################
+[auth.google]
+enabled = false
+allow_sign_up = true
+client_id = some_client_id
+client_secret = some_client_secret
+scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+auth_url = https://accounts.google.com/o/oauth2/auth
+token_url = https://accounts.google.com/o/oauth2/token
+api_url = https://www.googleapis.com/oauth2/v1/userinfo
+allowed_domains =
+hosted_domain =
+
+#################################### Grafana.com Auth ####################
+# legacy key names (so they work in env variables)
+[auth.grafananet]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+allowed_organizations =
+
+[auth.grafana_com]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+allowed_organizations =
+
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+name = Azure AD
+enabled = false
+allow_sign_up = true
+client_id = some_client_id
+client_secret = some_client_secret
+scopes = openid email profile
+auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+allowed_domains =
+allowed_groups =
+
+#################################### Generic OAuth #######################
+[auth.generic_oauth]
+name = OAuth
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+email_attribute_name = email:primary
+email_attribute_path =
+role_attribute_path =
+auth_url =
+token_url =
+api_url =
+allowed_domains =
+team_ids =
+allowed_organizations =
+tls_skip_verify_insecure = false
+tls_client_cert =
+tls_client_key =
+tls_client_ca =
+
+#################################### SAML Auth ###########################
+[auth.saml] # Enterprise only
+# Defaults to false. If true, the feature is enabled
+enabled = false
+
+# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
+certificate =
+
+# Path to the public X.509 certificate. Used to sign requests to the IdP
+certificate_path =
+
+# Base64-encoded private key. Used to decrypt assertions from the IdP
+private_key =
+
+# Path to the private key. Used to decrypt assertions from the IdP
+private_key_path =
+
+# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata =
+
+# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata_path =
+
+# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
+idp_metadata_url =
+
+# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
+max_issue_delay = 90s
+
+# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
+metadata_valid_duration = 48h
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's name
+assertion_attribute_name = displayName
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
+assertion_attribute_login = mail
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's email
+assertion_attribute_email = mail
+
+#################################### Basic Auth ##########################
+[auth.basic]
+enabled = true
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+enabled = false
+header_name = X-WEBAUTH-USER
+header_property = username
+auto_sign_up = true
+# Deprecated, use sync_ttl instead
+ldap_sync_ttl = 60
+sync_ttl = 60
+whitelist =
+headers =
+enable_login_token = false
+
+#################################### Auth LDAP ###########################
+[auth.ldap]
+enabled = false
+config_file = /etc/grafana/ldap.toml
+allow_sign_up = true
+
+# LDAP backround sync (Enterprise only)
+# At 1 am every day
+sync_cron = "0 0 1 * * *"
+active_sync_enabled = false
+
+#################################### SMTP / Emailing #####################
+[smtp]
+enabled = false
+host = localhost:25
+user =
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+password =
+cert_file =
+key_file =
+skip_verify = false
+from_address = admin@grafana.localhost
+from_name = Grafana
+ehlo_identity =
+
+[emails]
+welcome_email_on_sign_up = false
+templates_pattern = emails/*.html
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and file
+# Use space to separate multiple modes, e.g. "console file"
+mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+filters =
+
+# For "console" mode only
+[log.console]
+level =
+
+# log line format, valid options are text, console and json
+format = console
+
+# For "file" mode only
+[log.file]
+level =
+
+# log line format, valid options are text, console and json
+format = text
+
+# This enables automated log rotate(switch of following options), default is true
+log_rotate = true
+
+# Max line number of single file, default is 1000000
+max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+max_size_shift = 28
+
+# Segment log daily, default is true
+daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+max_days = 7
+
+[log.syslog]
+level =
+
+# log line format, valid options are text, console and json
+format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+network =
+address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+tag =
+
+#################################### Usage Quotas ########################
+[quota]
+enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+org_user = 10
+
+# limit number of dashboards per Org.
+org_dashboard = 100
+
+# limit number of data_sources per Org.
+org_data_source = 10
+
+# limit number of api_keys per Org.
+org_api_key = 10
+
+# limit number of orgs a user can create.
+user_org = 10
+
+# Global limit of users.
+global_user = -1
+
+# global limit of orgs.
+global_org = -1
+
+# global limit of dashboards
+global_dashboard = -1
+
+# global limit of api_keys
+global_api_key = -1
+
+# global limit on number of logged in users.
+global_session = -1
+
+#################################### Alerting ############################
+[alerting]
+# Disable alerting engine & UI features
+enabled = true
+# Makes it possible to turn off alert rule execution but alerting UI is visible
+execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+concurrent_render_limit = 5
+
+# Default setting for alert calculation timeout. Default value is 30
+evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+max_attempts = 3
+
+# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
+min_interval_seconds = 1
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+enabled = true
+
+#################################### Internal Grafana Metrics ############
+# Metrics available at HTTP API Url /metrics
+[metrics]
+enabled              = true
+interval_seconds     = 10
+# Disable total stats (stat_totals_*) metrics to be generated
+disable_total_stats = false
+
+#If both are set, basic auth will be required for the metrics endpoint.
+basic_auth_username =
+basic_auth_password =
+
+# Send internal Grafana metrics to graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+address =
+prefix = prod.grafana.%(instance_name)s.
+
+#################################### Grafana.com integration  ##########################
+[grafana_net]
+url = https://grafana.com
+
+[grafana_com]
+url = https://grafana.com
+
+#################################### Distributed tracing ############
+[tracing.jaeger]
+# jaeger destination (ex localhost:6831)
+address =
+# tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+always_included_tag =
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+sampler_param = 1
+# Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
+zipkin_propagation = false
+# Setting this to true disables shared RPC spans.
+# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
+disable_shared_zipkin_spans = false
+
+#################################### External Image Storage ##############
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# You can choose between (s3, webdav, gcs, azure_blob, local)
+provider =
+
+[external_image_storage.s3]
+endpoint =
+path_style_access =
+bucket_url =
+bucket =
+region =
+path =
+access_key =
+secret_key =
+
+[external_image_storage.webdav]
+url =
+username =
+password =
+public_url =
+
+[external_image_storage.gcs]
+key_file =
+bucket =
+path =
+
+[external_image_storage.azure_blob]
+account_name =
+account_key =
+container_name =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+server_url =
+# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+callback_url =
+
+[panels]
+# here for to support old env variables, can remove after a few months
+enable_alpha = false
+disable_sanitize_html = false
+
+[plugins]
+enable_alpha = false
+app_tls_skip_verify_insecure = false
+
+[enterprise]
+license_path =
+
+[feature_toggles]
+# enable features, separated by spaces
+enable =

grafana.spec

@@ -15,7 +15,8 @@ end}
 %endif
 
 Name:             grafana
-Version:          6.6.2
+Version:          6.7.2
+%global commit    423a25f
 Release:          1%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          ASL 2.0
@@ -30,11 +31,13 @@ Source1:          grafana_webpack-%{version}.tar.gz
 # Source2 is the script to create the above webpack from grafana sources
 Source2:          make_grafana_webpack.sh
 
+# Source3 contains Grafana configuration defaults for distributions
+Source3:          distro-defaults.ini
+
 # Patches
-Patch0:           000-set-version-string.patch
 Patch1:           001-login-oauth-use-oauth2-exchange.patch
 Patch2:           002-remove-jaeger-tracing.patch
-Patch3:           003-new-files.patch
+Patch3:           003-manpages.patch
 Patch4:           004-wrappers-grafana-cli.patch
 Patch5:           005-pkg-main-fix-import-paths.patch
 Patch6:           006-pkg-setting-ini-default-section.patch
@@ -75,232 +78,185 @@ Recommends: grafana-pcp >= 2
 
 %if 0%{?unbundle_vendor_sources}
 # golang build deps. These allow us to unbundle vendor golang source.
-# Note: commented lines are still vendored. See the build section below
+# Note: generated with the list_go_buildrequires.sh script (see README.md)
-BuildRequires: golang(cloud.google.com/go)
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/VividCortex/mysqlerr)
 BuildRequires: golang(github.com/apache/arrow/go/arrow)
-BuildRequires: golang(github.com/aws/aws-sdk-go)
+BuildRequires: golang(github.com/apache/arrow/go/arrow/array)
-BuildRequires: golang(github.com/beevik/etree)
+BuildRequires: golang(github.com/apache/arrow/go/arrow/ipc)
+BuildRequires: golang(github.com/apache/arrow/go/arrow/memory)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awsutil)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/defaults)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/request)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/cloudwatch)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/ec2)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/ec2/ec2iface)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/sts)
 BuildRequires: golang(github.com/benbjohnson/clock)
-BuildRequires: golang(github.com/beorn7/perks/quantile)
 BuildRequires: golang(github.com/bradfitz/gomemcache/memcache)
-BuildRequires: golang(github.com/cespare/xxhash)
+BuildRequires: golang(github.com/BurntSushi/toml)
 BuildRequires: golang(github.com/cheekybits/genny/generic)
-BuildRequires: golang(github.com/codegangsta/cli)
 BuildRequires: golang(github.com/crewjam/saml)
-BuildRequires: golang(github.com/crewjam/saml/xmlenc)
-BuildRequires: golang(github.com/crewjam/saml/logger)
-BuildRequires: golang(github.com/crewjam/httperr)
 BuildRequires: golang(github.com/davecgh/go-spew/spew)
 BuildRequires: golang(github.com/denisenkom/go-mssqldb)
 BuildRequires: golang(github.com/facebookgo/inject)
-BuildRequires: golang(github.com/facebookgo/structtag)
 BuildRequires: golang(github.com/fatih/color)
+BuildRequires: golang(github.com/gobwas/glob)
+BuildRequires: golang(github.com/golang/protobuf/proto)
 BuildRequires: golang(github.com/go-macaron/binding)
 BuildRequires: golang(github.com/go-macaron/gzip)
-BuildRequires: golang(github.com/go-macaron/inject)
 BuildRequires: golang(github.com/go-macaron/session)
-BuildRequires: golang(github.com/go-sql-driver/mysql)
+BuildRequires: golang(github.com/google/go-cmp/cmp)
-BuildRequires: golang(github.com/go-stack/stack)
+BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts)
-
-BuildRequires: golang(xorm.io/xorm)
-BuildRequires: golang(xorm.io/core)
-BuildRequires: golang(xorm.io/builder) >= 0.3.6
-
-BuildRequires: golang(github.com/gobwas/glob)
-BuildRequires: golang(github.com/golang/snappy)
-BuildRequires: golang(github.com/google/flatbuffers/go)
-BuildRequires: golang(github.com/gopherjs/gopherjs/js)
 BuildRequires: golang(github.com/gorilla/websocket)
 BuildRequires: golang(github.com/gosimple/slug)
-
+BuildRequires: golang(github.com/go-sql-driver/mysql)
-# These two are considered part of grafana, use vendored code
+BuildRequires: golang(github.com/go-stack/stack)
-# BuildRequires: golang(github.com/grafana/grafana-plugin-model)
+BuildRequires: golang(github.com/go-xorm/core)
-# BuildRequires: golang(github.com/grafana/grafana-plugin-sdk-go)
-
-BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus)
-BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/golang/protobuf/ptypes/any)
-BuildRequires: golang(github.com/golang/protobuf/ptypes/duration)
-BuildRequires: golang(github.com/golang/protobuf/ptypes/empty)
-BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp)
 BuildRequires: golang(github.com/hashicorp/go-hclog)
 BuildRequires: golang(github.com/hashicorp/go-plugin)
 BuildRequires: golang(github.com/hashicorp/go-version)
-BuildRequires: golang(github.com/hashicorp/yamux)
 BuildRequires: golang(github.com/inconshreveable/log15)
 BuildRequires: golang(github.com/jmespath/go-jmespath)
-BuildRequires: golang(github.com/jonboulle/clockwork)
-BuildRequires: golang(github.com/json-iterator/go)
-BuildRequires: golang(github.com/jtolds/gls)
 BuildRequires: golang(github.com/jung-kurt/gofpdf)
-BuildRequires: golang(github.com/klauspost/compress)
-BuildRequires: golang(github.com/klauspost/cpuid)
 BuildRequires: golang(github.com/lib/pq)
 BuildRequires: golang(github.com/linkedin/goavro)
 BuildRequires: golang(github.com/mattetti/filebuffer)
-BuildRequires: golang(github.com/mattn/go-colorable)
 BuildRequires: golang(github.com/mattn/go-isatty)
 BuildRequires: golang(github.com/mattn/go-sqlite3)
-BuildRequires: golang(github.com/matttproud/golang_protobuf_extensions/pbutil)
-BuildRequires: golang(github.com/mitchellh/go-testing-interface)
-BuildRequires: golang(github.com/modern-go/concurrent)
-BuildRequires: golang(github.com/modern-go/reflect2)
-BuildRequires: golang(github.com/oklog/run)
 BuildRequires: golang(github.com/opentracing/opentracing-go)
+BuildRequires: golang(github.com/opentracing/opentracing-go/ext)
+BuildRequires: golang(github.com/opentracing/opentracing-go/log)
 BuildRequires: golang(github.com/patrickmn/go-cache)
 BuildRequires: golang(github.com/pkg/errors)
-BuildRequires: golang(github.com/pmezard/go-difflib/difflib)
 BuildRequires: golang(github.com/prometheus/client_golang/api)
+BuildRequires: golang(github.com/prometheus/client_golang/api/prometheus/v1)
+BuildRequires: golang(github.com/prometheus/client_golang/prometheus)
+BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp)
 BuildRequires: golang(github.com/prometheus/client_model/go)
+BuildRequires: golang(github.com/prometheus/common/expfmt)
 BuildRequires: golang(github.com/prometheus/common/model)
-BuildRequires: golang(github.com/prometheus/procfs)
-BuildRequires: golang(github.com/rainycape/unidecode)
 BuildRequires: golang(github.com/robfig/cron)
-BuildRequires: golang(gopkg.in/robfig/cron.v3)
-BuildRequires: golang(github.com/russellhaering/goxmldsig)
-BuildRequires: golang(github.com/sergi/go-diff/diffmatchpatch)
-BuildRequires: golang(github.com/smartystreets/assertions)
 BuildRequires: golang(github.com/smartystreets/goconvey/convey)
-BuildRequires: golang(github.com/smartystreets/goconvey/convey/gotest)
+BuildRequires: golang(github.com/stretchr/testify/require)
-BuildRequires: golang(github.com/smartystreets/goconvey/convey/reporting)
-BuildRequires: golang(github.com/stretchr/testify)
 BuildRequires: golang(github.com/teris-io/shortid)
 BuildRequires: golang(github.com/ua-parser/uap-go/uaparser)
+BuildRequires: golang(github.com/uber/jaeger-client-go/config)
+BuildRequires: golang(github.com/uber/jaeger-client-go/zipkin)
 BuildRequires: golang(github.com/Unknwon/com)
+BuildRequires: golang(github.com/urfave/cli/v2)
+BuildRequires: golang(github.com/VividCortex/mysqlerr)
 BuildRequires: golang(github.com/yudai/gojsondiff)
-BuildRequires: golang(github.com/yudai/golcs)
+BuildRequires: golang(github.com/yudai/gojsondiff/formatter)
-BuildRequires: golang(go.uber.org/atomic)
-BuildRequires: golang(golang.org/x/crypto/ed25519)
-BuildRequires: golang(golang.org/x/crypto/md4)
 BuildRequires: golang(golang.org/x/crypto/pbkdf2)
-BuildRequires: golang(golang.org/x/crypto/ripemd160)
-BuildRequires: golang(golang.org/x/lint)
 BuildRequires: golang(golang.org/x/net/context)
-BuildRequires: golang(golang.org/x/net/http/httpguts)
+BuildRequires: golang(golang.org/x/net/context/ctxhttp)
-BuildRequires: golang(golang.org/x/net/http2)
-BuildRequires: golang(golang.org/x/net/idna)
-BuildRequires: golang(golang.org/x/net/internal/timeseries)
-BuildRequires: golang(golang.org/x/net/trace)
 BuildRequires: golang(golang.org/x/oauth2)
+BuildRequires: golang(golang.org/x/oauth2/google)
+BuildRequires: golang(golang.org/x/oauth2/jwt)
 BuildRequires: golang(golang.org/x/sync/errgroup)
-BuildRequires: golang(golang.org/x/sys/unix)
-BuildRequires: golang(golang.org/x/text)
-BuildRequires: golang(golang.org/x/tools/go/ast/astutil)
-BuildRequires: golang(golang.org/x/tools/go/gcexportdata)
-BuildRequires: golang(golang.org/x/tools/go/internal/gcimporter)
 BuildRequires: golang(golang.org/x/xerrors)
-BuildRequires: golang(google.golang.org/appengine)
-BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status)
 BuildRequires: golang(google.golang.org/grpc)
-BuildRequires: golang(gopkg.in/alexcesaro/quotedprintable.v3)
+BuildRequires: golang(google.golang.org/grpc/codes)
-BuildRequires: golang(gopkg.in/asn1-ber.v1)
+BuildRequires: golang(google.golang.org/grpc/metadata)
+BuildRequires: golang(google.golang.org/grpc/status)
 BuildRequires: golang(gopkg.in/ini.v1)
 BuildRequires: golang(gopkg.in/ldap.v3)
 BuildRequires: golang(gopkg.in/macaron.v1)
 BuildRequires: golang(gopkg.in/mail.v2)
 BuildRequires: golang(gopkg.in/redis.v5)
+BuildRequires: golang(gopkg.in/robfig/cron.v3)
 BuildRequires: golang(gopkg.in/square/go-jose.v2)
+BuildRequires: golang(gopkg.in/square/go-jose.v2/jwt)
 BuildRequires: golang(gopkg.in/yaml.v2)
+BuildRequires: golang(xorm.io/xorm)
 %endif
 
 # Declare all nodejs modules bundled in the webpack - this is for security
 # purposes so if nodejs-foo ever needs an update, affected packages can be
-# easily identified. This is generated from package-lock.json once the webpack
+# easily identified.
-# has been built with make_webpack.sh.
+# Note: generated with the list_bundled_nodejs_packages.sh script (see README.md)
-Provides: bundled(nodejs-abbrev) = 1.1.1
+Provides: bundled(nodejs-@braintree/sanitize-url) = 4.0.0
-Provides: bundled(nodejs-ansi-regex) = 2.1.1
+Provides: bundled(nodejs-@grafana/slate-react) = 0.22.9-grafana
-Provides: bundled(nodejs-ansi-styles) = 2.2.1
+Provides: bundled(nodejs-@reduxjs/toolkit) = 1.2.1
-Provides: bundled(nodejs-argparse) = 1.0.10
+Provides: bundled(nodejs-@torkelo/react-select) = 3.0.8
-Provides: bundled(nodejs-array-find-index) = 1.0.2
+Provides: bundled(nodejs-@types/md5) = 2.1.33
-Provides: bundled(nodejs-async) = 1.5.2
+Provides: bundled(nodejs-@types/react-loadable) = 5.5.2
-Provides: bundled(nodejs-balanced-match) = 1.0.0
+Provides: bundled(nodejs-@types/react-virtualized-auto-sizer) = 1.0.0
-Provides: bundled(nodejs-brace-expansion) = 1.1.11
+Provides: bundled(nodejs-@types/uuid) = 3.4.7
-Provides: bundled(nodejs-builtin-modules) = 1.1.1
+Provides: bundled(nodejs-abortcontroller-polyfill) = 1.4.0
-Provides: bundled(nodejs-camelcase) = 2.1.1
+Provides: bundled(nodejs-angular) = 1.6.9
-Provides: bundled(nodejs-camelcase-keys) = 2.1.0
+Provides: bundled(nodejs-angular-bindonce) = 0.3.1
-Provides: bundled(nodejs-chalk) = 1.1.3
+Provides: bundled(nodejs-angular-native-dragdrop) = 1.2.2
-Provides: bundled(nodejs-coffee-script) = 1.10.0
+Provides: bundled(nodejs-angular-route) = 1.6.6
-Provides: bundled(nodejs-colors) = 1.1.2
+Provides: bundled(nodejs-angular-sanitize) = 1.6.6
-Provides: bundled(nodejs-concat-map) = 0.0.1
+Provides: bundled(nodejs-baron) = 3.0.3
-Provides: bundled(nodejs-currently-unhandled) = 0.4.1
+Provides: bundled(nodejs-brace) = 0.10.0
-Provides: bundled(nodejs-dateformat) = 1.0.12
+Provides: bundled(nodejs-calculate-size) = 1.1.1
-Provides: bundled(nodejs-decamelize) = 1.2.0
+Provides: bundled(nodejs-classnames) = 2.2.6
-Provides: bundled(nodejs-error-ex) = 1.3.2
+Provides: bundled(nodejs-clipboard) = 2.0.4
-Provides: bundled(nodejs-escape-string-regexp) = 1.0.5
+Provides: bundled(nodejs-core-js) = 1.2.7
-Provides: bundled(nodejs-esprima) = 2.7.3
+Provides: bundled(nodejs-d3) = 5.15.0
-Provides: bundled(nodejs-eventemitter2) = 0.4.14
+Provides: bundled(nodejs-d3-scale-chromatic) = 1.5.0
-Provides: bundled(nodejs-exit) = 0.1.2
+Provides: bundled(nodejs-emotion) = 10.0.27
-Provides: bundled(nodejs-find-up) = 1.1.2
+Provides: bundled(nodejs-eventemitter3) = 2.0.3
-Provides: bundled(nodejs-findup-sync) = 0.3.0
+Provides: bundled(nodejs-fast-text-encoding) = 1.0.0
-Provides: bundled(nodejs-fs.realpath) = 1.0.0
+Provides: bundled(nodejs-file-saver) = 1.3.8
-Provides: bundled(nodejs-get-stdin) = 4.0.1
+Provides: bundled(nodejs-hoist-non-react-statics) = 3.3.0
-Provides: bundled(nodejs-getobject) = 0.1.0
+Provides: bundled(nodejs-immutable) = 3.8.2
-Provides: bundled(nodejs-glob) = 7.0.6
+Provides: bundled(nodejs-is-hotkey) = 0.1.4
-Provides: bundled(nodejs-graceful-fs) = 4.1.15
+Provides: bundled(nodejs-jquery) = 3.4.1
-Provides: bundled(nodejs-grunt) = 1.0.1
+Provides: bundled(nodejs-lodash) = 3.10.1
-Provides: bundled(nodejs-grunt-cli) = 1.2.0
+Provides: bundled(nodejs-lru-cache) = 4.1.5
-Provides: bundled(nodejs-grunt-known-options) = 1.1.1
+Provides: bundled(nodejs-marked) = 0.3.19
-Provides: bundled(nodejs-grunt-legacy-log) = 1.0.2
+Provides: bundled(nodejs-md5) = 2.2.1
-Provides: bundled(nodejs-lodash) = 4.17.11
+Provides: bundled(nodejs-memoize-one) = 4.1.0
-Provides: bundled(nodejs-grunt-legacy-log-utils) = 1.0.0
+Provides: bundled(nodejs-moment) = 2.24.0
-Provides: bundled(nodejs-grunt-legacy-util) = 1.0.0
+Provides: bundled(nodejs-mousetrap) = 1.6.3
-Provides: bundled(nodejs-has-ansi) = 2.0.0
+Provides: bundled(nodejs-mousetrap-global-bind) = 1.1.0
-Provides: bundled(nodejs-hooker) = 0.2.3
+Provides: bundled(nodejs-nodemon) = 1.18.10
-Provides: bundled(nodejs-hosted-git-info) = 2.7.1
+Provides: bundled(nodejs-papaparse) = 4.6.3
-Provides: bundled(nodejs-iconv-lite) = 0.4.24
+Provides: bundled(nodejs-prismjs) = 1.16.0
-Provides: bundled(nodejs-indent-string) = 2.1.0
+Provides: bundled(nodejs-prop-types) = 15.7.2
-Provides: bundled(nodejs-inflight) = 1.0.6
+Provides: bundled(nodejs-rc-cascader) = 0.17.5
-Provides: bundled(nodejs-inherits) = 2.0.3
+Provides: bundled(nodejs-re-resizable) = 6.2.0
-Provides: bundled(nodejs-is-arrayish) = 0.2.1
+Provides: bundled(nodejs-react) = 16.10.2
-Provides: bundled(nodejs-is-builtin-module) = 1.0.0
+Provides: bundled(nodejs-react-dom) = 16.10.2
-Provides: bundled(nodejs-is-finite) = 1.0.2
+Provides: bundled(nodejs-react-grid-layout) = 0.17.1
-Provides: bundled(nodejs-is-utf8) = 0.2.1
+Provides: bundled(nodejs-react-highlight-words) = 0.11.0
-Provides: bundled(nodejs-isexe) = 2.0.0
+Provides: bundled(nodejs-react-loadable) = 5.5.0
-Provides: bundled(nodejs-js-yaml) = 3.5.5
+Provides: bundled(nodejs-react-popper) = 1.3.3
-Provides: bundled(nodejs-load-json-file) = 1.1.0
+Provides: bundled(nodejs-react-redux) = 7.1.1
-Provides: bundled(nodejs-loud-rejection) = 1.6.0
+Provides: bundled(nodejs-react-sizeme) = 2.5.2
-Provides: bundled(nodejs-map-obj) = 1.0.1
+Provides: bundled(nodejs-react-split-pane) = 0.1.89
-Provides: bundled(nodejs-meow) = 3.7.0
+Provides: bundled(nodejs-react-transition-group) = 2.6.1
-Provides: bundled(nodejs-minimatch) = 3.0.4
+Provides: bundled(nodejs-react-use) = 12.8.0
-Provides: bundled(nodejs-minimist) = 1.2.0
+Provides: bundled(nodejs-react-virtualized-auto-sizer) = 1.0.2
-Provides: bundled(nodejs-nopt) = 3.0.6
+Provides: bundled(nodejs-react-window) = 1.7.1
-Provides: bundled(nodejs-normalize-package-data) = 2.4.2
+Provides: bundled(nodejs-redux) = 3.7.2
-Provides: bundled(nodejs-number-is-nan) = 1.0.1
+Provides: bundled(nodejs-redux-logger) = 3.0.6
-Provides: bundled(nodejs-object-assign) = 4.1.1
+Provides: bundled(nodejs-redux-thunk) = 2.3.0
-Provides: bundled(nodejs-once) = 1.4.0
+Provides: bundled(nodejs-regenerator-runtime) = 0.11.1
-Provides: bundled(nodejs-parse-json) = 2.2.0
+Provides: bundled(nodejs-reselect) = 4.0.0
-Provides: bundled(nodejs-path-exists) = 2.1.0
+Provides: bundled(nodejs-rst2html) = 1.0.4
-Provides: bundled(nodejs-path-is-absolute) = 1.0.1
+Provides: bundled(nodejs-rxjs) = 5.5.12
-Provides: bundled(nodejs-path-type) = 1.1.0
+Provides: bundled(nodejs-search-query-parser) = 1.5.2
-Provides: bundled(nodejs-pify) = 2.3.0
+Provides: bundled(nodejs-slate) = 0.47.8
-Provides: bundled(nodejs-pinkie) = 2.0.4
+Provides: bundled(nodejs-slate-plain-serializer) = 0.7.10
-Provides: bundled(nodejs-pinkie-promise) = 2.0.1
+Provides: bundled(nodejs-tether) = 1.4.5
-Provides: bundled(nodejs-read-pkg) = 1.1.0
+Provides: bundled(nodejs-tether-drop) = 1.5.0
-Provides: bundled(nodejs-read-pkg-up) = 1.0.1
+Provides: bundled(nodejs-tinycolor2) = 1.4.1
-Provides: bundled(nodejs-redent) = 1.0.0
+Provides: bundled(nodejs-tti-polyfill) = 0.2.2
-Provides: bundled(nodejs-repeating) = 2.0.1
+Provides: bundled(nodejs-uuid) = 3.3.3
-Provides: bundled(nodejs-resolve) = 1.1.7
+Provides: bundled(nodejs-whatwg-fetch) = 3.0.0
-Provides: bundled(nodejs-rimraf) = 2.2.8
+Provides: bundled(nodejs-xss) = 1.0.3
-Provides: bundled(nodejs-safer-buffer) = 2.1.2
-Provides: bundled(nodejs-semver) = 5.6.0
-Provides: bundled(nodejs-signal-exit) = 3.0.2
-Provides: bundled(nodejs-spdx-correct) = 3.1.0
-Provides: bundled(nodejs-spdx-exceptions) = 2.2.0
-Provides: bundled(nodejs-spdx-expression-parse) = 3.0.0
-Provides: bundled(nodejs-spdx-license-ids) = 3.0.3
-Provides: bundled(nodejs-sprintf-js) = 1.0.3
-Provides: bundled(nodejs-strip-ansi) = 3.0.1
-Provides: bundled(nodejs-strip-bom) = 2.0.0
-Provides: bundled(nodejs-strip-indent) = 1.0.1
-Provides: bundled(nodejs-supports-color) = 2.0.0
-Provides: bundled(nodejs-trim-newlines) = 1.0.0
-Provides: bundled(nodejs-underscore.string) = 3.2.3
-Provides: bundled(nodejs-validate-npm-package-license) = 3.0.4
-Provides: bundled(nodejs-which) = 1.2.14
-Provides: bundled(nodejs-wrappy) = 1.0.2
-Provides: bundled(nodejs-yarn) = 1.13.0
 
 
 %description
@@ -396,7 +352,6 @@ The Grafana stackdriver datasource.
 %prep
 %setup -q -T -D -b 0
 %setup -q -T -D -b 1
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -432,11 +387,16 @@ cd %{_builddir}/src/github.com/grafana/grafana
 %global archbindir bin/`go env GOOS`-`go env GOARCH`
 echo _builddir=%{_builddir} archbindir=%{archbindir} gopath=%{gopath}
 [ ! -d %{archbindir} ] && mkdir -p %{archbindir}
+
 # non-modular build
 export GOPATH=%{_builddir}:%{gopath}
 export GO111MODULE=off; rm -f go.mod
-%gobuild -o %{archbindir}/grafana-cli ./pkg/cmd/grafana-cli
+
-%gobuild -o %{archbindir}/grafana-server ./pkg/cmd/grafana-server
+# see grafana-X.X.X/build.go
+export LDFLAGS="-X main.version=%{version} -X main.commit=%{commit} -X main.buildstamp=${SOURCE_DATE_EPOCH} -X main.buildBranch=master"
+for cmd in grafana-cli grafana-server; do
+    %gobuild -o %{archbindir}/${cmd} ./pkg/cmd/${cmd}
+done
 
 %install
 # Fix up arch bin directories
@@ -470,9 +430,9 @@ install -d %{buildroot}%{_sysconfdir}/%{name}
 install -d %{buildroot}%{_sysconfdir}/sysconfig
 
 # config defaults
-install -p -m 644 conf/distro-defaults.ini \
+install -p -m 644 %{SOURCE3} \
     %{buildroot}%{_sysconfdir}/%{name}/grafana.ini
-install -p -m 644 conf/distro-defaults.ini \
+install -p -m 644 %{SOURCE3} \
     %{buildroot}%{_datadir}/%{name}/conf/defaults.ini
 install -p -m 644 conf/ldap.toml %{buildroot}%{_sysconfdir}/%{name}/ldap.toml
 install -p -m 644 packaging/rpm/sysconfig/grafana-server \
@@ -545,7 +505,6 @@ export GO111MODULE=off
 
 # shared directory and all files therein, except some datasources
 %{_datadir}/%{name}
-%{_datadir}/%{name}/public
 
 # built-in datasources that are sub-packaged
 %global dsdir %{_datadir}/%{name}/public/app/plugins/datasource
@@ -585,42 +544,58 @@ export GO111MODULE=off
 #
 %files cloudwatch
 %{_datadir}/%{name}/public/app/plugins/datasource/cloudwatch
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/cloudwatch/README.md
 
 %files elasticsearch
 %{_datadir}/%{name}/public/app/plugins/datasource/elasticsearch
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/elasticsearch/README.md
 
 %files azure-monitor
 %{_datadir}/%{name}/public/app/plugins/datasource/grafana-azure-monitor-datasource
 
 %files graphite
 %{_datadir}/%{name}/public/app/plugins/datasource/graphite
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/graphite/README.md
 
 %files influxdb
 %{_datadir}/%{name}/public/app/plugins/datasource/influxdb
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/influxdb/README.md
 
 %files loki
 %{_datadir}/%{name}/public/app/plugins/datasource/loki
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/loki/README.md
 
 %files mssql
 %{_datadir}/%{name}/public/app/plugins/datasource/mssql
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/mssql/README.md
 
 %files mysql
 %{_datadir}/%{name}/public/app/plugins/datasource/mysql
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/mysql/README.md
 
 %files opentsdb
 %{_datadir}/%{name}/public/app/plugins/datasource/opentsdb
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/opentsdb/README.md
 
 %files postgres
 %{_datadir}/%{name}/public/app/plugins/datasource/postgres
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/postgres/README.md
 
 %files prometheus
 %{_datadir}/%{name}/public/app/plugins/datasource/prometheus
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/prometheus/README.md
 
 %files stackdriver
 %{_datadir}/%{name}/public/app/plugins/datasource/stackdriver
+%doc %{_datadir}/%{name}/public/app/plugins/datasource/stackdriver/README.md
 
 
 %changelog
+* Thu Apr 23 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.2-1
+- update to 6.7.2 tagged upstream community sources, see CHANGELOG
+- set grafana version
+- add declare README.md as documentation of datasource plugins
+
 * Wed Feb 26 2020 Mark Goodwin <mgoodwin@redhat.com> 6.6.2-1
 - added patch0 to set the version string correctly
 - removed patch 004-xerrors.patch, it's now upstream

make_grafana_webpack.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2019 Red Hat.
+# Copyright (c) 2019-2020 Red Hat.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -17,9 +17,8 @@
 
 # grafana version (must be tagged on github.com/grafana/grafana as "v$VER")
 VER=$1
-BUILDDIR=`mktemp -d buildXXXXXX`
 
-[ ! -f /usr/bin/npm ] && echo Error, please install \"npm\" package && exit 1
+command -v yarn || { echo Error, please install the yarn package manager. && exit 1; }
 
 # get src tree and set cwd
 echo Fetching pristine upstream git tagged branch for grafana version v$VER ...
@@ -36,9 +35,7 @@ sed -i '/phantomjs/d' scripts/grunt/*.js
 
 # populate node_modules using package.json
 echo Running yarn to populate local node_modules ....
-npm install yarn
+yarn --non-interactive --no-progress --ignore-engines install --pure-lockfile > yarn.out 2>&1
-node_modules/yarn/bin/yarn --non-interactive --no-progress --ignore-engines install --pure-lockfile > yarn.out 2>&1
-node_modules/yarn/bin/yarn --non-interactive -W add webpack-cli
 
 # build the webpack
 echo;echo Building production webpack ....
@@ -56,6 +53,6 @@ fi
 
 # done
 echo Both grafana-$VER.tar.gz and grafana_webpack-$VER.tar.gz
-echo should now be copied to your \$HOME/rpmbuild/SOURCES
+echo should now be in your working directory.
 
 exit 0

scripts/list_bundled_nodejs_packages.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+import sys
+import json
+import re
+from packaging import version
+
+
+def read_declared_pkgs(package_json_path):
+    with open(package_json_path) as f:
+        package_json = json.load(f)
+        return list(package_json['dependencies'].keys())
+
+
+def read_installed_pkgs(yarn_lock_path):
+    with open(yarn_lock_path) as f:
+        lockfile = f.read()
+        return re.findall(r'^"?'  # can start with a "
+                          r'(.+?)@.+(?:,.*)?:\n'  # characters up to @
+                          r'  version "(.+)"',  # and the version
+                          lockfile, re.MULTILINE)
+
+
+def list_provides(declared_pkgs, installed_pkgs):
+    for declared_pkg in declared_pkgs:
+        # there can be multiple versions installed of one package (transitive dependencies)
+        # but rpm doesn't support Provides: with a single package and multiple versions
+        # so let's declare the oldest version here
+        versions = [version.parse(pkg_version)
+                    for pkg_name, pkg_version in installed_pkgs if pkg_name == declared_pkg]
+        oldest_version = sorted(versions)[0]
+        yield f"Provides: bundled(nodejs-{declared_pkg}) = {oldest_version}"
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print(f"usage: {sys.argv[0]} grafana-X.Y.Z/", file=sys.stdout)
+        sys.exit(1)
+
+    grafana_dir = sys.argv[1]
+    declared_pkgs = read_declared_pkgs(f"{grafana_dir}/package.json")
+    installed_pkgs = read_installed_pkgs(f"{grafana_dir}/yarn.lock")
+    provides = list_provides(declared_pkgs, installed_pkgs)
+    for provide in sorted(provides):
+        print(provide)

scripts/list_go_buildrequires.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -eu
+
+[ $# -ne 1 ] && echo "Usage: $0 grafana-X.Y.Z/" && exit 1
+GRAFANA_SOURCES="$(readlink -f "$1")"
+
+cd "$(mktemp -d)"
+mkdir -p src/github.com/grafana
+ln -s "${GRAFANA_SOURCES}" src/github.com/grafana/grafana
+ln -s "${GRAFANA_SOURCES}/vendor/github.com/grafana/grafana-plugin-model" src/github.com/grafana/grafana-plugin-model
+ln -s "${GRAFANA_SOURCES}/vendor/github.com/grafana/grafana-plugin-sdk-go" src/github.com/grafana/grafana-plugin-sdk-go
+
+for pkg in grafana grafana-plugin-model grafana-plugin-sdk-go
+do
+    GOPATH=$(pwd) golist --imported --package-path "github.com/grafana/$pkg" --skip-self --template 'BuildRequires: golang({{.}})\n'
+done | sed \
+    -e "s,github.com/linkedin/goavro/v2,github.com/linkedin/goavro,g" \
+    -e "s,github.com/go-xorm/xorm,xorm.io/xorm,g" \
+    -e "s,github.com/robfig/cron/v3,gopkg.in/robfig/cron.v3,g" \
+    -e "s,github.com/unknwon/com,github.com/Unknwon/com,g" \
+    | sort | uniq

scripts/run_container_build.sh

@@ -0,0 +1,23 @@
+#!/bin/bash -eu
+
+[ $# -lt 1 ] && echo "Usage: $0 fedora-version" && exit 1
+FEDORA_VERSION="$1"
+
+if [ -d deps ]; then
+    INSTALL_UNPUBLISHED_DEPENDENCIES=$'COPY deps/ /deps\nRUN cd /deps && dnf -y install *.rpm'
+else
+    INSTALL_UNPUBLISHED_DEPENDENCIES=""
+fi
+
+cat <<EOF | podman build -f - .
+FROM fedora:${FEDORA_VERSION}
+RUN dnf install -y rpkg
+RUN mkdir /grafana /deps
+
+${INSTALL_UNPUBLISHED_DEPENDENCIES}
+
+COPY grafana.spec *.patch grafana-*.tar.gz grafana_webpack-*.tar.gz make_grafana_webpack.sh distro-defaults.ini /grafana
+WORKDIR /grafana
+RUN dnf -y builddep grafana.spec
+RUN rpkg local
+EOF

sources

@@ -1,2 +1,2 @@
-SHA512 (grafana-6.6.2.tar.gz) = 43019302a2ade713a8f8429ce9dd3a1016c5aa3afe1af463ef905718aa018d429e8872b262c0c9bc72ea7cb6a08c7b47769af6c5cec098dfd4ce70ff36715a86
+SHA512 (grafana-6.7.2.tar.gz) = cd02dd2d637b352d3190c45331752025d756c9e8a8f66ddab390ad853f81335a6d2f7b014481c4e7092d2543f8354c06ff0e37ec21a0a1cd18c9e37813e0cffb
-SHA512 (grafana_webpack-6.6.2.tar.gz) = d2d1a50f6b51738f68ff33844479c361ba61f023af02b7c48e4a67eefd85ca3a485a626c4ac10b3d7c13ddf40fffe2ca7f6faac29173cd8dc66586f38587ec89
+SHA512 (grafana_webpack-6.7.2.tar.gz) = e13f2403491fbc66e5f18a5462f067e768012b7d86a23186a56bdadad8e42f1d48225b555af925ee6ca72f5df73f235d0d8fd8a04d17c7e3f25c7ac014a00fe3