The package rpms/grafana.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/grafana.git/commit/?id=45533ac201....
Change:
+ExclusiveArch: %{grafana_arches}
Thanks.
Full change:
============
commit 45533ac2010f24c2b4074c01f76c248632cd9cef
Author: Mark Goodwin <mgoodwin(a)redhat.com>
Date: Fri Aug 30 17:20:48 2019 +1000
Update to 6.3.4
diff --git a/.gitignore b/.gitignore
index 9ecf9bc..cc7f7fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
/grafana_webpack-6.2.2.tar.gz
/grafana-6.2.5.tar.gz
/grafana_webpack-6.2.5.tar.gz
+/grafana-6.3.4.tar.gz
+/grafana_webpack-6.3.4.tar.gz
diff --git a/001-login-oauth-use-oauth2-exchange.patch
b/001-login-oauth-use-oauth2-exchange.patch
index d62067d..ff59d44 100644
--- a/001-login-oauth-use-oauth2-exchange.patch
+++ b/001-login-oauth-use-oauth2-exchange.patch
@@ -1,5 +1,5 @@
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
-index a3599bc7a..0c6579847 100644
+index a46c97238..76fc8480c 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -125,7 +125,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
diff --git a/002-remove-jaeger-tracing.patch b/002-remove-jaeger-tracing.patch
index 1f624cc..0d20b5e 100644
--- a/002-remove-jaeger-tracing.patch
+++ b/002-remove-jaeger-tracing.patch
@@ -1,34 +1,36 @@
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
-index 2ac326ed3..20943918c 100644
+index 85d6db43e..6de99b58b 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
-@@ -21,7 +21,6 @@ import (
+@@ -23,7 +23,6 @@ import (
_ "github.com/grafana/grafana/pkg/infra/metrics"
_ "github.com/grafana/grafana/pkg/infra/remotecache"
_ "github.com/grafana/grafana/pkg/infra/serverlock"
- _ "github.com/grafana/grafana/pkg/infra/tracing"
_ "github.com/grafana/grafana/pkg/infra/usagestats"
- "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/login"
+ "github.com/grafana/grafana/pkg/login/social"
diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go
deleted file mode 100644
-index fd7258b7a..000000000
+index d1511a533..000000000
--- a/pkg/infra/tracing/tracing.go
+++ /dev/null
-@@ -1,129 +0,0 @@
+@@ -1,148 +0,0 @@
-package tracing
-
-import (
- "context"
+- "fmt"
- "io"
- "strings"
-
-- "github.com/grafana/grafana/pkg/log"
+- "github.com/grafana/grafana/pkg/infra/log"
- "github.com/grafana/grafana/pkg/registry"
- "github.com/grafana/grafana/pkg/setting"
-
- opentracing "github.com/opentracing/opentracing-go"
- jaegercfg "github.com/uber/jaeger-client-go/config"
+- "github.com/uber/jaeger-client-go/zipkin"
-)
-
-func init() {
@@ -36,13 +38,15 @@ index fd7258b7a..000000000
-}
-
-type TracingService struct {
-- enabled bool
-- address string
-- customTags map[string]string
-- samplerType string
-- samplerParam float64
-- log log.Logger
-- closer io.Closer
+- enabled bool
+- address string
+- customTags map[string]string
+- samplerType string
+- samplerParam float64
+- log log.Logger
+- closer io.Closer
+- zipkinPropagation bool
+- disableSharedZipkinSpans bool
-
- Cfg *setting.Cfg `inject:""`
-}
@@ -72,6 +76,8 @@ index fd7258b7a..000000000
- ts.customTags =
splitTagSettings(section.Key("always_included_tag").MustString(""))
- ts.samplerType = section.Key("sampler_type").MustString("")
- ts.samplerParam = section.Key("sampler_param").MustFloat64(1)
+- ts.zipkinPropagation = section.Key("zipkin_propagation").MustBool(false)
+- ts.disableSharedZipkinSpans =
section.Key("disable_shared_zipkin_spans").MustBool(false)
-}
-
-func (ts *TracingService) initGlobalTracer() error {
@@ -97,6 +103,18 @@ index fd7258b7a..000000000
- options = append(options, jaegercfg.Tag(tag, value))
- }
-
+- if ts.zipkinPropagation {
+- zipkinPropagator := zipkin.NewZipkinB3HTTPHeaderPropagator()
+- options = append(options,
+- jaegercfg.Injector(opentracing.HTTPHeaders, zipkinPropagator),
+- jaegercfg.Extractor(opentracing.HTTPHeaders, zipkinPropagator),
+- )
+-
+- if !ts.disableSharedZipkinSpans {
+- options = append(options, jaegercfg.ZipkinSharedRPCSpan(true))
+- }
+- }
+-
- tracer, closer, err := cfg.NewTracer(options...)
- if err != nil {
- return err
@@ -142,8 +160,9 @@ index fd7258b7a..000000000
- jlw.logger.Error(msg)
-}
-
--func (jlw *jaegerLogWrapper) Infof(msg string, args ...interface{}) {
-- jlw.logger.Info(msg, args)
+-func (jlw *jaegerLogWrapper) Infof(format string, args ...interface{}) {
+- msg := fmt.Sprintf(format, args...)
+- jlw.logger.Info(msg)
-}
diff --git a/pkg/infra/tracing/tracing_test.go b/pkg/infra/tracing/tracing_test.go
deleted file mode 100644
diff --git a/003-new-files.patch b/003-new-files.patch
index 41f4369..cf0c325 100644
--- a/003-new-files.patch
+++ b/003-new-files.patch
@@ -1,9 +1,9 @@
diff --git a/conf/distro-defaults.ini b/conf/distro-defaults.ini
new file mode 100644
-index 000000000..67d39b845
+index 000000000..e7a0c5062
--- /dev/null
+++ b/conf/distro-defaults.ini
-@@ -0,0 +1,626 @@
+@@ -0,0 +1,683 @@
+##################### Grafana Configuration Defaults for distros #####################
+#
+# Do not modify this file in grafana installs
@@ -53,6 +53,9 @@ index 000000000..67d39b845
+# 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
+
@@ -217,6 +220,10 @@ index 000000000..67d39b845
+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
+
@@ -290,6 +297,9 @@ index 000000000..67d39b845
+# 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
@@ -377,6 +387,47 @@ index 000000000..67d39b845
+tls_client_ca =
+send_client_credentials_via_post = false
+
++#################################### 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
@@ -398,7 +449,8 @@ index 000000000..67d39b845
+allow_sign_up = true
+
+# LDAP backround sync (Enterprise only)
-+sync_cron = @hourly
++# At 1 am every day
++sync_cron = "0 0 1 * * *"
+active_sync_enabled = false
+
+#################################### SMTP / Emailing #####################
@@ -581,6 +633,11 @@ index 000000000..67d39b845
+# 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]
@@ -864,10 +921,10 @@ index 000000000..f97c2a26b
+
diff --git a/packaging/rpm/spec/grafana.spec b/packaging/rpm/spec/grafana.spec
new file mode 100644
-index 000000000..0b6c8fef0
+index 000000000..81d21aaf4
--- /dev/null
+++ b/packaging/rpm/spec/grafana.spec
-@@ -0,0 +1,725 @@
+@@ -0,0 +1,737 @@
+%global grafana_arches %{lua: go_arches = {}
+ for arch in rpm.expand("%{go_arches}"):gmatch("%S+") do
+ go_arches[arch] = 1
@@ -886,7 +943,7 @@ index 000000000..0b6c8fef0
+
+
+Name: grafana
-+Version: 6.2.5
++Version: 6.3.4
+Release: 1%{?dist}
+Summary: Metrics dashboard and graph editor
+License: ASL 2.0
@@ -905,6 +962,7 @@ index 000000000..0b6c8fef0
+Patch1: 001-login-oauth-use-oauth2-exchange.patch
+Patch2: 002-remove-jaeger-tracing.patch
+Patch3: 003-new-files.patch
++Patch4: 004-fix-uaparser-32bit.patch
+
+# Intersection of go_arches and nodejs_arches
+ExclusiveArch: %{grafana_arches}
@@ -1067,6 +1125,7 @@ index 000000000..0b6c8fef0
+BuildRequires:
golang(golang.org/x/sync/errgroup)
+BuildRequires: golang(gopkg.in/ldap.v3)
+BuildRequires: golang(gopkg.in/mail.v2)
++BuildRequires:
golang(github.com/jonboulle/clockwork)
+%endif
+
+# Declare all nodejs modules bundled in the webpack - this is for security
@@ -1263,6 +1322,7 @@ index 000000000..0b6c8fef0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
++%patch4 -p1
+
+# Set up build subdirs and links
+mkdir -p %{_builddir}/src/github.com/grafana
@@ -1278,7 +1338,11 @@ index 000000000..0b6c8fef0
+# Another exception is xerrors, which is a transition package
+# for the new Go 1.13 error values, see
https://github.com/golang/xerrors
+cp --parents -a
vendor/github.com/grafana vendor/golang.org/x/xerrors \
-+
vendor/github.com/robfig %{_builddir}
++
vendor/github.com/robfig vendor/github.com/crewjam/saml \
++
vendor/github.com/ua-parser/uap-go/uaparser \
++
vendor/github.com/beevik/etree \
++
vendor/github.com/russellhaering/goxmldsig \
++ %{_builddir}
+rm -r vendor # remove all vendor sources
+mv %{_builddir}/vendor vendor # put back what we're keeping
+%endif
@@ -1379,6 +1443,7 @@ index 000000000..0b6c8fef0
+rm -f pkg/services/provisioning/dashboards/file_reader_linux_test.go
+rm -f pkg/services/provisioning/dashboards/file_reader_test.go
+rm -f pkg/services/sqlstore/alert_test.go
++rm -f pkg/services/sqlstore/apikey_test.go
+go test ./pkg/...
+
+
@@ -1478,6 +1543,10 @@ index 000000000..0b6c8fef0
+
+
+%changelog
++* Fri Aug 30 2019 Mark Goodwin <mgoodwin(a)redhat.com> 6.3.4-1
++- add patch for uaparser on 32bit systems
++- update to latest upstream community sources, see CHANGELOG
++
+* Wed Jul 31 2019 Mark Goodwin <mgoodwin(a)redhat.com> 6.2.5-1
+- update to latest upstream community sources, see CHANGELOG
+
diff --git a/004-fix-uaparser-32bit.patch b/004-fix-uaparser-32bit.patch
new file mode 100644
index 0000000..ee2bd16
--- /dev/null
+++ b/004-fix-uaparser-32bit.patch
@@ -0,0 +1,38 @@
+diff --git
a/vendor/github.com/ua-parser/uap-go/uaparser/parser.go
b/vendor/github.com/ua-parser/uap-go/uaparser/parser.go
+index a6f147412..30c9aba61 100644
+---
a/vendor/github.com/ua-parser/uap-go/uaparser/parser.go
++++
b/vendor/github.com/ua-parser/uap-go/uaparser/parser.go
+@@ -16,7 +16,9 @@ type RegexesDefinitions struct {
+ UA []*uaParser `yaml:"user_agent_parsers"`
+ OS []*osParser `yaml:"os_parsers"`
+ Device []*deviceParser `yaml:"device_parsers"`
++ _ [4]byte // padding for alignment
+ sync.RWMutex
++
+ }
+
+ type UserAgentSorter []*uaParser
+@@ -32,6 +34,7 @@ type uaParser struct {
+ V1Replacement string `yaml:"v1_replacement"`
+ V2Replacement string `yaml:"v2_replacement"`
+ V3Replacement string `yaml:"v3_replacement"`
++ _ [4]byte // padding for alignment
+ MatchesCount uint64
+ }
+
+@@ -64,6 +67,7 @@ type osParser struct {
+ V2Replacement string `yaml:"os_v2_replacement"`
+ V3Replacement string `yaml:"os_v3_replacement"`
+ V4Replacement string `yaml:"os_v4_replacement"`
++ _ [4]byte // padding for alignment
+ MatchesCount uint64
+ }
+
+@@ -97,6 +101,7 @@ type deviceParser struct {
+ DeviceReplacement string `yaml:"device_replacement"`
+ BrandReplacement string `yaml:"brand_replacement"`
+ ModelReplacement string `yaml:"model_replacement"`
++ _ [4]byte // padding for alignment
+ MatchesCount uint64
+ }
+
diff --git a/grafana.spec b/grafana.spec
index 0b6c8fe..81d21aa 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -16,7 +16,7 @@ end}
Name: grafana
-Version: 6.2.5
+Version: 6.3.4
Release: 1%{?dist}
Summary: Metrics dashboard and graph editor
License: ASL 2.0
@@ -35,6 +35,7 @@ Source2: make_grafana_webpack.sh
Patch1: 001-login-oauth-use-oauth2-exchange.patch
Patch2: 002-remove-jaeger-tracing.patch
Patch3: 003-new-files.patch
+Patch4: 004-fix-uaparser-32bit.patch
# Intersection of go_arches and nodejs_arches
ExclusiveArch: %{grafana_arches}
@@ -197,6 +198,7 @@ BuildRequires:
golang(github.com/go-yaml/yaml)
BuildRequires:
golang(golang.org/x/sync/errgroup)
BuildRequires: golang(gopkg.in/ldap.v3)
BuildRequires: golang(gopkg.in/mail.v2)
+BuildRequires:
golang(github.com/jonboulle/clockwork)
%endif
# Declare all nodejs modules bundled in the webpack - this is for security
@@ -393,6 +395,7 @@ The Grafana stackdriver datasource.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# Set up build subdirs and links
mkdir -p %{_builddir}/src/github.com/grafana
@@ -408,7 +411,11 @@ rm -f public/sass/.sass-lint.yml public/test/.jshintrc
# Another exception is xerrors, which is a transition package
# for the new Go 1.13 error values, see
https://github.com/golang/xerrors
cp --parents -a
vendor/github.com/grafana vendor/golang.org/x/xerrors \
-
vendor/github.com/robfig %{_builddir}
+
vendor/github.com/robfig vendor/github.com/crewjam/saml \
+
vendor/github.com/ua-parser/uap-go/uaparser \
+
vendor/github.com/beevik/etree \
+
vendor/github.com/russellhaering/goxmldsig \
+ %{_builddir}
rm -r vendor # remove all vendor sources
mv %{_builddir}/vendor vendor # put back what we're keeping
%endif
@@ -509,6 +516,7 @@ export GOPATH=%{_builddir}:%{gopath}
rm -f pkg/services/provisioning/dashboards/file_reader_linux_test.go
rm -f pkg/services/provisioning/dashboards/file_reader_test.go
rm -f pkg/services/sqlstore/alert_test.go
+rm -f pkg/services/sqlstore/apikey_test.go
go test ./pkg/...
@@ -608,6 +616,10 @@ go test ./pkg/...
%changelog
+* Fri Aug 30 2019 Mark Goodwin <mgoodwin(a)redhat.com> 6.3.4-1
+- add patch for uaparser on 32bit systems
+- update to latest upstream community sources, see CHANGELOG
+
* Wed Jul 31 2019 Mark Goodwin <mgoodwin(a)redhat.com> 6.2.5-1
- update to latest upstream community sources, see CHANGELOG
diff --git a/sources b/sources
index 3893aa1..9fddda2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (grafana-6.2.5.tar.gz) =
6b50f13013ca1e2fa1025fa877a8f1539aefb4dab36c715674704d182bab41ead2db1eed46c0de202456250f82a7f2e0287d2bcb96b6925f8c2b710d326e673e
-SHA512 (grafana_webpack-6.2.5.tar.gz) =
b6fde4b039c931331d35525aef45fb99033401bc793b6ce122b962fc91205e097cc0537bf4889173f7e40c14f607d085c91f1d438a9d0d49e24856a938a62b27
+SHA512 (grafana-6.3.4.tar.gz) =
5dcf3f4ccb087e6a94037d15b58bde5ec3a46dc77a3943f26d5ac077602fc7707cd92e521937367a36e96a609ac1393e235fee8f19d13389fe0f55bf25b1cbb2
+SHA512 (grafana_webpack-6.3.4.tar.gz) =
eb6be083e6008bd18b7e0c7f0743b2627d6f31eef63c75b4c6ecb4b63dda46efcf436cd42684076e0293372e4883547ac97f38d15181256f58b487682f5d8bf5