RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/grafana#fa4f56cd7cde56d3cb3318f12605d3776b62dd5c
This commit is contained in:
Petr Šabata
parent
5ad0749474
commit
da782a8237
3
.gitignore
vendored
3
.gitignore
vendored
@ -0,0 +1,3 @@
|
|||||||
|
/grafana-*.tar.gz
|
||||||
|
/grafana-*.tar.gz.manifest
|
||||||
|
/grafana-*/
|
||||||
26
001-wrappers-grafana-cli.patch
Normal file
26
001-wrappers-grafana-cli.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/packaging/wrappers/grafana-cli b/packaging/wrappers/grafana-cli
|
||||||
|
index 9cad151c0d..6b7ec1ab42 100755
|
||||||
|
--- a/packaging/wrappers/grafana-cli
|
||||||
|
+++ b/packaging/wrappers/grafana-cli
|
||||||
|
@@ -12,11 +12,12 @@ CONF_DIR=/etc/grafana
|
||||||
|
DATA_DIR=/var/lib/grafana
|
||||||
|
PLUGINS_DIR=/var/lib/grafana/plugins
|
||||||
|
LOG_DIR=/var/log/grafana
|
||||||
|
+LIBEXEC_DIR=/usr/libexec/grafana
|
||||||
|
|
||||||
|
CONF_FILE=$CONF_DIR/grafana.ini
|
||||||
|
PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
|
||||||
|
|
||||||
|
-EXECUTABLE=$GRAFANA_HOME/bin/grafana-cli
|
||||||
|
+EXECUTABLE=$LIBEXEC_DIR/grafana-cli
|
||||||
|
|
||||||
|
if [ ! -x $EXECUTABLE ]; then
|
||||||
|
echo "Program not installed or not executable"
|
||||||
|
@@ -24,6 +25,7 @@ if [ ! -x $EXECUTABLE ]; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
# overwrite settings from default file
|
||||||
|
+#shellcheck disable=SC1090
|
||||||
|
if [ -f "$DEFAULT" ]; then
|
||||||
|
. "$DEFAULT"
|
||||||
|
fi
|
||||||
219
002-manpages.patch
Normal file
219
002-manpages.patch
Normal file
@ -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/ .
|
||||||
85
003-golang1.15.patch
Normal file
85
003-golang1.15.patch
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
|
||||||
|
index b58cf217d3..90e110974e 100644
|
||||||
|
--- a/pkg/api/dashboard_test.go
|
||||||
|
+++ b/pkg/api/dashboard_test.go
|
||||||
|
@@ -3,6 +3,7 @@ package api
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
+ "strconv"
|
||||||
|
"io/ioutil"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
@@ -828,7 +829,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
|
||||||
|
bus.AddHandler("test", func(query *models.GetDashboardVersionQuery) error {
|
||||||
|
query.Result = &models.DashboardVersion{
|
||||||
|
Data: simplejson.NewFromAny(map[string]interface{}{
|
||||||
|
- "title": "Dash" + string(query.DashboardId),
|
||||||
|
+ "title": "Dash" + strconv.FormatInt(query.DashboardId, 10),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
diff --git a/pkg/components/gtime/gtime_test.go b/pkg/components/gtime/gtime_test.go
|
||||||
|
index 4dab30fbf6..e4ba096a43 100644
|
||||||
|
--- a/pkg/components/gtime/gtime_test.go
|
||||||
|
+++ b/pkg/components/gtime/gtime_test.go
|
||||||
|
@@ -22,7 +22,7 @@ func TestParseInterval(t *testing.T) {
|
||||||
|
{interval: "1M", duration: now.Sub(now.AddDate(0, -1, 0))},
|
||||||
|
{interval: "1y", duration: now.Sub(now.AddDate(-1, 0, 0))},
|
||||||
|
{interval: "5y", duration: now.Sub(now.AddDate(-5, 0, 0))},
|
||||||
|
- {interval: "invalid-duration", err: "time: invalid duration invalid-duration"},
|
||||||
|
+ {interval: "invalid-duration", err: "time: invalid duration \"invalid-duration\""},
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, tc := range tcs {
|
||||||
|
diff --git a/pkg/services/sqlstore/alert_notification_test.go b/pkg/services/sqlstore/alert_notification_test.go
|
||||||
|
index 75d5582022..4986d0d781 100644
|
||||||
|
--- a/pkg/services/sqlstore/alert_notification_test.go
|
||||||
|
+++ b/pkg/services/sqlstore/alert_notification_test.go
|
||||||
|
@@ -168,7 +168,7 @@ func TestAlertNotificationSQLAccess(t *testing.T) {
|
||||||
|
cmd.Frequency = "invalid duration"
|
||||||
|
|
||||||
|
err := CreateAlertNotificationCommand(cmd)
|
||||||
|
- So(err.Error(), ShouldEqual, "time: invalid duration invalid duration")
|
||||||
|
+ So(err.Error(), ShouldEqual, "time: invalid duration \"invalid duration\"")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
@@ -199,7 +199,7 @@ func TestAlertNotificationSQLAccess(t *testing.T) {
|
||||||
|
|
||||||
|
err := UpdateAlertNotification(updateCmd)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
- So(err.Error(), ShouldEqual, "time: invalid duration invalid duration")
|
||||||
|
+ So(err.Error(), ShouldEqual, "time: invalid duration \"invalid duration\"")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
diff --git a/pkg/services/sqlstore/sqlbuilder_test.go b/pkg/services/sqlstore/sqlbuilder_test.go
|
||||||
|
index 42159171b0..abf669d294 100644
|
||||||
|
--- a/pkg/services/sqlstore/sqlbuilder_test.go
|
||||||
|
+++ b/pkg/services/sqlstore/sqlbuilder_test.go
|
||||||
|
@@ -5,6 +5,7 @@ import (
|
||||||
|
"math/rand"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
+ "strconv"
|
||||||
|
|
||||||
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
|
"github.com/grafana/grafana/pkg/models"
|
||||||
|
@@ -193,12 +194,12 @@ func test(t *testing.T, dashboardProps DashboardProps, dashboardPermission *Dash
|
||||||
|
func createDummyUser() (*models.User, error) {
|
||||||
|
uid := rand.Intn(9999999)
|
||||||
|
createUserCmd := &models.CreateUserCommand{
|
||||||
|
- Email: string(uid) + "@example.com",
|
||||||
|
- Login: string(uid),
|
||||||
|
- Name: string(uid),
|
||||||
|
+ Email: strconv.Itoa(uid) + "@example.com",
|
||||||
|
+ Login: strconv.Itoa(uid),
|
||||||
|
+ Name: strconv.Itoa(uid),
|
||||||
|
Company: "",
|
||||||
|
OrgName: "",
|
||||||
|
- Password: string(uid),
|
||||||
|
+ Password: strconv.Itoa(uid),
|
||||||
|
EmailVerified: true,
|
||||||
|
IsAdmin: false,
|
||||||
|
SkipOrgSetup: false,
|
||||||
17
004-remove-goldenfiles-test.patch
Normal file
17
004-remove-goldenfiles-test.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/pkg/tsdb/influxdb/flux/executor_test.go b/pkg/tsdb/influxdb/flux/executor_test.go
|
||||||
|
index b42389c94d..a24e16f97e 100644
|
||||||
|
--- a/pkg/tsdb/influxdb/flux/executor_test.go
|
||||||
|
+++ b/pkg/tsdb/influxdb/flux/executor_test.go
|
||||||
|
@@ -285,12 +285,3 @@ func TestBuckets(t *testing.T) {
|
||||||
|
fmt.Println("----------------------")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-func TestGoldenFiles(t *testing.T) {
|
||||||
|
- t.Run("Renamed", func(t *testing.T) {
|
||||||
|
- _, err := verifyGoldenResponse("renamed")
|
||||||
|
- if err != nil {
|
||||||
|
- t.Fatal(err.Error())
|
||||||
|
- }
|
||||||
|
- })
|
||||||
|
-}
|
||||||
30
Makefile
Normal file
30
Makefile
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
all: grafana-vendor-$(VER).tar.gz \
|
||||||
|
grafana-vendor-$(VER).tar.gz.manifest \
|
||||||
|
grafana-webpack-$(VER).tar.gz \
|
||||||
|
grafana-webpack-$(VER).tar.gz.manifest
|
||||||
|
|
||||||
|
grafana-$(VER).tar.gz grafana-$(VER):
|
||||||
|
wget https://github.com/grafana/grafana/archive/v$(VER)/grafana-$(VER).tar.gz
|
||||||
|
tar xfz grafana-$(VER).tar.gz
|
||||||
|
|
||||||
|
grafana-vendor-$(VER).tar.gz: grafana-$(VER).tar.gz
|
||||||
|
cd grafana-$(VER) && go mod vendor -v
|
||||||
|
tar cfz $@ grafana-$(VER)/vendor
|
||||||
|
|
||||||
|
grafana-vendor-$(VER).tar.gz.manifest: grafana-$(VER).tar.gz
|
||||||
|
awk '$$2~/^v/ && $$4 != "indirect" {print "Provides: bundled(golang(" $$1 ")) = " substr($$2, 2)}' grafana-$(VER)/go.mod | \
|
||||||
|
sed -E 's/=(.*)-(.*)-(.*)/=\1-\2.\3/g' > $@
|
||||||
|
|
||||||
|
grafana-webpack-$(VER).tar.gz: grafana-$(VER).tar.gz
|
||||||
|
cd grafana-$(VER) && yarn install --pure-lockfile && yarn run build
|
||||||
|
cd grafana-$(VER) && \
|
||||||
|
mkdir plugins-bundled/external && yarn run plugins:build-bundled && \
|
||||||
|
for plugin in plugins-bundled/internal/*; do mv $$plugin $$plugin.tmp; mv $$plugin.tmp/dist $$plugin; rm -rf $$plugin.tmp; done && \
|
||||||
|
rm plugins-bundled/README.md plugins-bundled/.gitignore plugins-bundled/external.json
|
||||||
|
tar cfz $@ grafana-$(VER)/public/build grafana-$(VER)/public/views grafana-$(VER)/plugins-bundled
|
||||||
|
|
||||||
|
grafana-webpack-$(VER).tar.gz.manifest: grafana-$(VER).tar.gz
|
||||||
|
./create_webpack_manifest.py grafana-$(VER)/ > $@
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf *.tar.gz grafana-*/
|
||||||
15
README.md
Normal file
15
README.md
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
# grafana
|
||||||
|
The grafana package
|
||||||
|
|
||||||
|
## Upgrade instructions
|
||||||
|
(replace X.Y.Z with the new Grafana version)
|
||||||
|
|
||||||
|
* update `Version` and `%changelog` in the specfile
|
||||||
|
* create bundles and manifests: `VER=X.Y.Z make`
|
||||||
|
* update specfile with contents of `grafana-vendor-X.Y.Z.tar.gz.manifest` and `grafana-webpack-X.Y.Z.tar.gz.manifest`
|
||||||
|
* 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
|
||||||
|
* run local build: `rpkg local`
|
||||||
|
* run rpm linter: `rpkg lint`
|
||||||
|
* run local builds with different OS versions: `./run_container_build.sh version`
|
||||||
|
* run a scratch build: `fedpkg scratch-build --srpm`
|
||||||
|
* upload new source tarballs: `fedpkg new-sources grafana-X.Y.Z.tar.gz grafana-vendor-X.Y.Z.tar.gz grafana-webpack-X.Y.Z.tar.gz`
|
||||||
44
create_webpack_manifest.py
Executable file
44
create_webpack_manifest.py
Executable file
@ -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)
|
||||||
773
distro-defaults.ini
Normal file
773
distro-defaults.ini
Normal file
@ -0,0 +1,773 @@
|
|||||||
|
##################### 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 = /etc/grafana/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 waits before timing out, default is 30 seconds.
|
||||||
|
# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
|
||||||
|
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.
|
||||||
|
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.
|
||||||
|
x_content_type_options = true
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
x_xss_protection = true
|
||||||
|
|
||||||
|
|
||||||
|
#################################### 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 5 seconds.
|
||||||
|
# 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 = 1s
|
||||||
|
|
||||||
|
# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
|
||||||
|
default_home_dashboard_path =
|
||||||
|
|
||||||
|
#################################### 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
|
||||||
|
|
||||||
|
# OAuth state max age cookie duration. Defaults to 60 seconds.
|
||||||
|
oauth_state_cookie_max_age = 60
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# mask the Grafana version number for unauthenticated users
|
||||||
|
hide_version = false
|
||||||
|
|
||||||
|
#################################### 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 =
|
||||||
|
|
||||||
|
#################################### Okta OAuth #######################
|
||||||
|
[auth.okta]
|
||||||
|
name = Okta
|
||||||
|
enabled = false
|
||||||
|
allow_sign_up = true
|
||||||
|
client_id = some_id
|
||||||
|
client_secret = some_secret
|
||||||
|
scopes = openid profile email groups
|
||||||
|
auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
|
||||||
|
token_url = https://<tenant-id>.okta.com/oauth2/v1/token
|
||||||
|
api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
|
||||||
|
allowed_domains =
|
||||||
|
allowed_groups =
|
||||||
|
role_attribute_path =
|
||||||
|
|
||||||
|
#################################### 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 =
|
||||||
|
|
||||||
|
#################################### 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 = true
|
||||||
|
|
||||||
|
#################################### 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 =
|
||||||
|
startTLS_policy =
|
||||||
|
|
||||||
|
[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 =
|
||||||
|
# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
|
||||||
|
# which this setting can help protect against by only allowing a certain amount of concurrent requests.
|
||||||
|
concurrent_render_request_limit = 30
|
||||||
|
|
||||||
|
[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
|
||||||
|
# Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
|
||||||
|
allow_loading_unsigned_plugins =
|
||||||
|
|
||||||
|
#################################### Grafana Image Renderer Plugin ##########################
|
||||||
|
[plugin.grafana-image-renderer]
|
||||||
|
# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
|
||||||
|
# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
|
||||||
|
# timezone IDs. Fallbacks to TZ environment variable if not set.
|
||||||
|
rendering_timezone =
|
||||||
|
|
||||||
|
# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
|
||||||
|
# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
|
||||||
|
rendering_language =
|
||||||
|
|
||||||
|
# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
|
||||||
|
# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
|
||||||
|
rendering_viewport_device_scale_factor =
|
||||||
|
|
||||||
|
# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
|
||||||
|
# the security risk it's not recommended to ignore HTTPS errors.
|
||||||
|
rendering_ignore_https_errors =
|
||||||
|
|
||||||
|
# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
|
||||||
|
# only capture and log error messages. When enabled, debug messages are captured and logged as well.
|
||||||
|
# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
|
||||||
|
# [log].filter = rendering:debug.
|
||||||
|
rendering_verbose_logging =
|
||||||
|
|
||||||
|
# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
|
||||||
|
# Default is false. This can be useful to enable (true) when troubleshooting.
|
||||||
|
rendering_dumpio =
|
||||||
|
|
||||||
|
# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
|
||||||
|
# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
|
||||||
|
rendering_args =
|
||||||
|
|
||||||
|
# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
|
||||||
|
# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
|
||||||
|
# compatible with the plugin.
|
||||||
|
rendering_chrome_bin =
|
||||||
|
|
||||||
|
# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
|
||||||
|
# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
|
||||||
|
# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
|
||||||
|
rendering_mode =
|
||||||
|
|
||||||
|
# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
|
||||||
|
# and will cluster using browser instances.
|
||||||
|
# Mode 'context' will cluster using incognito pages.
|
||||||
|
rendering_clustering_mode =
|
||||||
|
# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
|
||||||
|
rendering_clustering_max_concurrency =
|
||||||
|
|
||||||
|
# Limit the maximum viewport width, height and device scale factor that can be requested.
|
||||||
|
rendering_viewport_max_width =
|
||||||
|
rendering_viewport_max_height =
|
||||||
|
rendering_viewport_max_device_scale_factor =
|
||||||
|
|
||||||
|
# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
|
||||||
|
# a port not in use.
|
||||||
|
grpc_host =
|
||||||
|
grpc_port =
|
||||||
|
|
||||||
|
[enterprise]
|
||||||
|
license_path =
|
||||||
|
|
||||||
|
[feature_toggles]
|
||||||
|
# enable features, separated by spaces
|
||||||
|
enable =
|
||||||
11
grafana.rpmlintrc
Normal file
11
grafana.rpmlintrc
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
addFilter("E: non-readable /etc/grafana/grafana.ini 640")
|
||||||
|
addFilter("E: non-readable /etc/grafana/ldap.toml 640")
|
||||||
|
addFilter("E: non-standard-dir-perm /var/lib/grafana 750")
|
||||||
|
addFilter("E: zero-length /usr/share/grafana/public/.*")
|
||||||
|
addFilter("E: script-without-shebang .*\.json")
|
||||||
|
|
||||||
|
addFilter("W: non-standard-uid.* grafana")
|
||||||
|
addFilter("W: non-standard-gid.* grafana")
|
||||||
|
addFilter("W: hidden-file-or-dir /usr/share/grafana/public/.*")
|
||||||
|
addFilter("W: log-files-without-logrotate .*")
|
||||||
|
addFilter("W: dangerous-command-in-%post chown")
|
||||||
585
grafana.spec
Normal file
585
grafana.spec
Normal file
@ -0,0 +1,585 @@
|
|||||||
|
%global grafana_arches %{lua: go_arches = {}
|
||||||
|
for arch in rpm.expand("%{go_arches}"):gmatch("%S+") do
|
||||||
|
go_arches[arch] = 1
|
||||||
|
end
|
||||||
|
for arch in rpm.expand("%{nodejs_arches}"):gmatch("%S+") do
|
||||||
|
if go_arches[arch] then
|
||||||
|
print(arch .. " ")
|
||||||
|
end
|
||||||
|
end}
|
||||||
|
|
||||||
|
Name: grafana
|
||||||
|
Version: 7.1.1
|
||||||
|
Release: 2%{?dist}
|
||||||
|
Summary: Metrics dashboard and graph editor
|
||||||
|
License: ASL 2.0
|
||||||
|
URL: https://grafana.org
|
||||||
|
|
||||||
|
# Source0 contains the tagged upstream sources
|
||||||
|
Source0: https://github.com/grafana/grafana/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Source1 contains the bundled Go dependencies
|
||||||
|
Source1: grafana-vendor-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Source2 contains the front-end javascript modules bundled into a webpack
|
||||||
|
Source2: grafana-webpack-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Source3 contains Grafana configuration defaults for distributions
|
||||||
|
Source3: distro-defaults.ini
|
||||||
|
|
||||||
|
# Source4 contains the Makefile to create a Go vendor tarball and a webpack from grafana sources
|
||||||
|
Source4: Makefile
|
||||||
|
|
||||||
|
# Source5 contains the script to generate the list of bundled nodejs packages
|
||||||
|
Source5: create_webpack_manifest.py
|
||||||
|
|
||||||
|
# Patches
|
||||||
|
Patch1: 001-wrappers-grafana-cli.patch
|
||||||
|
Patch2: 002-manpages.patch
|
||||||
|
|
||||||
|
# Required for Go >= 1.15
|
||||||
|
# https://github.com/golang/go/commit/201cb046b745f8bb00e3d382290190c74ba7b7e1
|
||||||
|
# https://github.com/golang/go/issues/32479
|
||||||
|
Patch3: 003-golang1.15.patch
|
||||||
|
|
||||||
|
# Required for s390x
|
||||||
|
# the golden files include memory dumps from a x86 machine
|
||||||
|
# integers are stored as little endian on x86, but as big endian on s390x
|
||||||
|
# therefore loading this memory dump fails on s390x
|
||||||
|
Patch4: 004-remove-goldenfiles-test.patch
|
||||||
|
|
||||||
|
# Intersection of go_arches and nodejs_arches
|
||||||
|
ExclusiveArch: %{grafana_arches}
|
||||||
|
|
||||||
|
# omit golang debugsource, see BZ995136 and related
|
||||||
|
%global dwz_low_mem_die_limit 0
|
||||||
|
%global _debugsource_template %{nil}
|
||||||
|
|
||||||
|
%global GRAFANA_USER %{name}
|
||||||
|
%global GRAFANA_GROUP %{name}
|
||||||
|
%global GRAFANA_HOME %{_datadir}/%{name}
|
||||||
|
|
||||||
|
# grafana-server service daemon uses systemd
|
||||||
|
%{?systemd_requires}
|
||||||
|
Requires(pre): shadow-utils
|
||||||
|
|
||||||
|
BuildRequires: git, systemd, golang, go-srpm-macros, go-rpm-macros
|
||||||
|
|
||||||
|
Obsoletes: grafana-cloudwatch < 7.1.1-1
|
||||||
|
Obsoletes: grafana-elasticsearch < 7.1.1-1
|
||||||
|
Obsoletes: grafana-azure-monitor < 7.1.1-1
|
||||||
|
Obsoletes: grafana-graphite < 7.1.1-1
|
||||||
|
Obsoletes: grafana-influxdb < 7.1.1-1
|
||||||
|
Obsoletes: grafana-loki < 7.1.1-1
|
||||||
|
Obsoletes: grafana-mssql < 7.1.1-1
|
||||||
|
Obsoletes: grafana-mysql < 7.1.1-1
|
||||||
|
Obsoletes: grafana-opentsdb < 7.1.1-1
|
||||||
|
Obsoletes: grafana-postgres < 7.1.1-1
|
||||||
|
Obsoletes: grafana-prometheus < 7.1.1-1
|
||||||
|
Obsoletes: grafana-stackdriver < 7.1.1-1
|
||||||
|
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
|
Recommends: grafana-pcp >= 3.0.0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# vendored golang build dependencies
|
||||||
|
# Note: generated by the Makefile (see README.md)
|
||||||
|
Provides: bundled(golang(github.com/BurntSushi/toml)) = 0.3.1
|
||||||
|
Provides: bundled(golang(github.com/VividCortex/mysqlerr)) = 0.0.0-20170204212430.6c6b55f8796f
|
||||||
|
Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.29.20
|
||||||
|
Provides: bundled(golang(github.com/benbjohnson/clock)) = 0.0.0-20161215174838.7dc76406b6d3
|
||||||
|
Provides: bundled(golang(github.com/bradfitz/gomemcache)) = 0.0.0-20190329173943.551aad21a668
|
||||||
|
Provides: bundled(golang(github.com/crewjam/saml)) = 0.0.0-20191031171751.c42136edf9b1
|
||||||
|
Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
|
||||||
|
Provides: bundled(golang(github.com/denisenkom/go-mssqldb)) = 0.0.0-20190707035753.2be1aa521ff4
|
||||||
|
Provides: bundled(golang(github.com/facebookgo/inject)) = 0.0.0-20180706035515.f23751cae28b
|
||||||
|
Provides: bundled(golang(github.com/fatih/color)) = 1.7.0
|
||||||
|
Provides: bundled(golang(github.com/go-macaron/binding)) = 0.0.0-20190806013118.0b4f37bab25b
|
||||||
|
Provides: bundled(golang(github.com/go-macaron/gzip)) = 0.0.0-20160222043647.cad1c6580a07
|
||||||
|
Provides: bundled(golang(github.com/go-macaron/session)) = 0.0.0-20190805070824.1a3cdc6f5659
|
||||||
|
Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.5.0
|
||||||
|
Provides: bundled(golang(github.com/go-stack/stack)) = 1.8.0
|
||||||
|
Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3
|
||||||
|
Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.0
|
||||||
|
Provides: bundled(golang(github.com/google/go-cmp)) = 0.4.0
|
||||||
|
Provides: bundled(golang(github.com/gorilla/websocket)) = 1.4.1
|
||||||
|
Provides: bundled(golang(github.com/gosimple/slug)) = 1.4.2
|
||||||
|
Provides: bundled(golang(github.com/grafana/grafana-plugin-model)) = 0.0.0-20190930120109.1fc953a61fb4
|
||||||
|
Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.75.0
|
||||||
|
Provides: bundled(golang(github.com/hashicorp/go-hclog)) = 0.0.0-20180709165350.ff2cf002a8dd
|
||||||
|
Provides: bundled(golang(github.com/hashicorp/go-plugin)) = 1.2.2
|
||||||
|
Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.1.0
|
||||||
|
Provides: bundled(golang(github.com/inconshreveable/log15)) = 0.0.0-20180818164646.67afb5ed74ec
|
||||||
|
Provides: bundled(golang(github.com/influxdata/influxdb-client-go)) = 1.3.0
|
||||||
|
Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.0.0-20180206201540.c2b33e8439af
|
||||||
|
Provides: bundled(golang(github.com/jung-kurt/gofpdf)) = 1.10.1
|
||||||
|
Provides: bundled(golang(github.com/lib/pq)) = 1.2.0
|
||||||
|
Provides: bundled(golang(github.com/linkedin/goavro/v2)) = 2.9.7
|
||||||
|
Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12
|
||||||
|
Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.11.0
|
||||||
|
Provides: bundled(golang(github.com/opentracing/opentracing-go)) = 1.1.0
|
||||||
|
Provides: bundled(golang(github.com/patrickmn/go-cache)) = 2.1.0+incompatible
|
||||||
|
Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1
|
||||||
|
Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.3.0
|
||||||
|
Provides: bundled(golang(github.com/prometheus/client_model)) = 0.1.0
|
||||||
|
Provides: bundled(golang(github.com/prometheus/common)) = 0.7.0
|
||||||
|
Provides: bundled(golang(github.com/robfig/cron)) = 0.0.0-20180505203441.b41be1df6967
|
||||||
|
Provides: bundled(golang(github.com/robfig/cron/v3)) = 3.0.0
|
||||||
|
Provides: bundled(golang(github.com/smartystreets/goconvey)) = 0.0.0-20190731233626.505e41936337
|
||||||
|
Provides: bundled(golang(github.com/stretchr/testify)) = 1.5.1
|
||||||
|
Provides: bundled(golang(github.com/teris-io/shortid)) = 0.0.0-20171029131806.771a37caa5cf
|
||||||
|
Provides: bundled(golang(github.com/timberio/go-datemath)) = 0.1.1-0.20200323150745.74ddef604fff
|
||||||
|
Provides: bundled(golang(github.com/ua-parser/uap-go)) = 0.0.0-20190826212731.daf92ba38329
|
||||||
|
Provides: bundled(golang(github.com/uber/jaeger-client-go)) = 2.24.0+incompatible
|
||||||
|
Provides: bundled(golang(github.com/unknwon/com)) = 1.0.1
|
||||||
|
Provides: bundled(golang(github.com/urfave/cli/v2)) = 2.1.1
|
||||||
|
Provides: bundled(golang(github.com/xorcare/pointer)) = 1.1.0
|
||||||
|
Provides: bundled(golang(github.com/yudai/gojsondiff)) = 1.0.0
|
||||||
|
Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20200406173513.056763e48d71
|
||||||
|
Provides: bundled(golang(golang.org/x/net)) = 0.0.0-20200501053045.e0ff5e5a1de5
|
||||||
|
Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200107190931.bf48bf16ab8d
|
||||||
|
Provides: bundled(golang(golang.org/x/sync)) = 0.0.0-20200317015054.43a5402ce75a
|
||||||
|
Provides: bundled(golang(golang.org/x/xerrors)) = 0.0.0-20191204190536.9bdfabe68543
|
||||||
|
Provides: bundled(golang(google.golang.org/grpc)) = 1.29.1
|
||||||
|
Provides: bundled(golang(gopkg.in/ini.v1)) = 1.46.0
|
||||||
|
Provides: bundled(golang(gopkg.in/ldap.v3)) = 3.0.2
|
||||||
|
Provides: bundled(golang(gopkg.in/macaron.v1)) = 1.3.9
|
||||||
|
Provides: bundled(golang(gopkg.in/mail.v2)) = 2.3.1
|
||||||
|
Provides: bundled(golang(gopkg.in/redis.v5)) = 5.2.9
|
||||||
|
Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.4.1
|
||||||
|
Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.2.8
|
||||||
|
Provides: bundled(golang(xorm.io/core)) = 0.7.3
|
||||||
|
Provides: bundled(golang(xorm.io/xorm)) = 0.8.1
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
# Note: generated with the Makefile (see README.md)
|
||||||
|
Provides: bundled(nodejs-@grafana/slate-react) = 0.22.9-grafana
|
||||||
|
Provides: bundled(nodejs-@reduxjs/toolkit) = 1.3.4
|
||||||
|
Provides: bundled(nodejs-@torkelo/react-select) = 3.0.8
|
||||||
|
Provides: bundled(nodejs-@types/antlr4) = 4.7.1
|
||||||
|
Provides: bundled(nodejs-@types/braintree__sanitize-url) = 4.0.0
|
||||||
|
Provides: bundled(nodejs-@types/common-tags) = 1.8.0
|
||||||
|
Provides: bundled(nodejs-@types/jsurl) = 1.2.28
|
||||||
|
Provides: bundled(nodejs-@types/md5) = 2.1.33
|
||||||
|
Provides: bundled(nodejs-@types/react-loadable) = 5.5.2
|
||||||
|
Provides: bundled(nodejs-@types/react-virtualized-auto-sizer) = 1.0.0
|
||||||
|
Provides: bundled(nodejs-@welldone-software/why-did-you-render) = 4.0.6
|
||||||
|
Provides: bundled(nodejs-abortcontroller-polyfill) = 1.4.0
|
||||||
|
Provides: bundled(nodejs-angular) = 1.6.9
|
||||||
|
Provides: bundled(nodejs-angular-bindonce) = 0.3.1
|
||||||
|
Provides: bundled(nodejs-angular-native-dragdrop) = 1.2.2
|
||||||
|
Provides: bundled(nodejs-angular-route) = 1.6.6
|
||||||
|
Provides: bundled(nodejs-angular-sanitize) = 1.6.6
|
||||||
|
Provides: bundled(nodejs-antlr4) = 4.8.0
|
||||||
|
Provides: bundled(nodejs-baron) = 3.0.3
|
||||||
|
Provides: bundled(nodejs-brace) = 0.11.1
|
||||||
|
Provides: bundled(nodejs-calculate-size) = 1.1.1
|
||||||
|
Provides: bundled(nodejs-classnames) = 2.2.6
|
||||||
|
Provides: bundled(nodejs-clipboard) = 2.0.4
|
||||||
|
Provides: bundled(nodejs-common-tags) = 1.8.0
|
||||||
|
Provides: bundled(nodejs-core-js) = 1.2.7
|
||||||
|
Provides: bundled(nodejs-d3) = 5.15.0
|
||||||
|
Provides: bundled(nodejs-d3-scale-chromatic) = 1.5.0
|
||||||
|
Provides: bundled(nodejs-dangerously-set-html-content) = 1.0.6
|
||||||
|
Provides: bundled(nodejs-emotion) = 10.0.27
|
||||||
|
Provides: bundled(nodejs-eventemitter3) = 3.1.2
|
||||||
|
Provides: bundled(nodejs-fast-text-encoding) = 1.0.0
|
||||||
|
Provides: bundled(nodejs-file-saver) = 2.0.2
|
||||||
|
Provides: bundled(nodejs-hoist-non-react-statics) = 2.5.5
|
||||||
|
Provides: bundled(nodejs-immutable) = 3.8.2
|
||||||
|
Provides: bundled(nodejs-is-hotkey) = 0.1.4
|
||||||
|
Provides: bundled(nodejs-jquery) = 3.4.1
|
||||||
|
Provides: bundled(nodejs-jsurl) = 0.1.5
|
||||||
|
Provides: bundled(nodejs-lodash) = 3.10.1
|
||||||
|
Provides: bundled(nodejs-lru-cache) = 4.1.5
|
||||||
|
Provides: bundled(nodejs-marked) = 0.3.19
|
||||||
|
Provides: bundled(nodejs-md5) = 2.2.1
|
||||||
|
Provides: bundled(nodejs-memoize-one) = 4.1.0
|
||||||
|
Provides: bundled(nodejs-moment) = 2.24.0
|
||||||
|
Provides: bundled(nodejs-moment-timezone) = 0.5.28
|
||||||
|
Provides: bundled(nodejs-mousetrap) = 1.6.5
|
||||||
|
Provides: bundled(nodejs-mousetrap-global-bind) = 1.1.0
|
||||||
|
Provides: bundled(nodejs-nodemon) = 2.0.2
|
||||||
|
Provides: bundled(nodejs-papaparse) = 4.6.3
|
||||||
|
Provides: bundled(nodejs-prismjs) = 1.17.1
|
||||||
|
Provides: bundled(nodejs-prop-types) = 15.7.2
|
||||||
|
Provides: bundled(nodejs-rc-cascader) = 1.0.1
|
||||||
|
Provides: bundled(nodejs-re-resizable) = 6.2.0
|
||||||
|
Provides: bundled(nodejs-react) = 16.10.2
|
||||||
|
Provides: bundled(nodejs-react-dom) = 16.10.2
|
||||||
|
Provides: bundled(nodejs-react-grid-layout) = 0.17.1
|
||||||
|
Provides: bundled(nodejs-react-highlight-words) = 0.16.0
|
||||||
|
Provides: bundled(nodejs-react-loadable) = 5.5.0
|
||||||
|
Provides: bundled(nodejs-react-popper) = 1.3.3
|
||||||
|
Provides: bundled(nodejs-react-redux) = 7.2.0
|
||||||
|
Provides: bundled(nodejs-react-sizeme) = 2.6.8
|
||||||
|
Provides: bundled(nodejs-react-split-pane) = 0.1.89
|
||||||
|
Provides: bundled(nodejs-react-transition-group) = 2.9.0
|
||||||
|
Provides: bundled(nodejs-react-use) = 13.27.0
|
||||||
|
Provides: bundled(nodejs-react-virtualized-auto-sizer) = 1.0.2
|
||||||
|
Provides: bundled(nodejs-react-window) = 1.8.5
|
||||||
|
Provides: bundled(nodejs-redux) = 3.7.2
|
||||||
|
Provides: bundled(nodejs-redux-logger) = 3.0.6
|
||||||
|
Provides: bundled(nodejs-redux-thunk) = 2.3.0
|
||||||
|
Provides: bundled(nodejs-regenerator-runtime) = 0.11.1
|
||||||
|
Provides: bundled(nodejs-reselect) = 4.0.0
|
||||||
|
Provides: bundled(nodejs-rst2html) = 1.0.4
|
||||||
|
Provides: bundled(nodejs-rxjs) = 6.5.5
|
||||||
|
Provides: bundled(nodejs-search-query-parser) = 1.5.4
|
||||||
|
Provides: bundled(nodejs-slate) = 0.47.8
|
||||||
|
Provides: bundled(nodejs-slate-plain-serializer) = 0.7.10
|
||||||
|
Provides: bundled(nodejs-tether) = 1.4.7
|
||||||
|
Provides: bundled(nodejs-tether-drop) = 1.5.0
|
||||||
|
Provides: bundled(nodejs-tinycolor2) = 1.4.1
|
||||||
|
Provides: bundled(nodejs-tti-polyfill) = 0.2.2
|
||||||
|
Provides: bundled(nodejs-whatwg-fetch) = 3.0.0
|
||||||
|
|
||||||
|
|
||||||
|
%description
|
||||||
|
Grafana is an open source, feature rich metrics dashboard and graph editor for
|
||||||
|
Graphite, InfluxDB & OpenTSDB.
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -T -D -b 0
|
||||||
|
rm -r plugins-bundled # compiled bundled plugins are in grafana-webpack
|
||||||
|
%setup -q -T -D -b 1
|
||||||
|
%setup -q -T -D -b 2
|
||||||
|
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%if 0%{?fedora} >= 33
|
||||||
|
%patch3 -p1
|
||||||
|
%endif
|
||||||
|
%ifarch s390x
|
||||||
|
%patch4 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Set up build subdirs and links
|
||||||
|
mkdir -p %{_builddir}/src/github.com/grafana
|
||||||
|
ln -sf %{_builddir}/%{name}-%{version} \
|
||||||
|
%{_builddir}/src/github.com/grafana/grafana
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
# Build the server-side binaries
|
||||||
|
cd %{_builddir}/src/github.com/grafana/grafana
|
||||||
|
export GOPATH=%{_builddir}
|
||||||
|
|
||||||
|
# see grafana-X.X.X/build.go
|
||||||
|
export LDFLAGS="-X main.version=%{version} -X main.buildstamp=${SOURCE_DATE_EPOCH}"
|
||||||
|
for cmd in grafana-cli grafana-server; do
|
||||||
|
%gobuild -o %{_builddir}/bin/${cmd} ./pkg/cmd/${cmd}
|
||||||
|
done
|
||||||
|
|
||||||
|
%install
|
||||||
|
|
||||||
|
# dirs, shared files, public html, webpack
|
||||||
|
install -d %{buildroot}%{_sbindir}
|
||||||
|
install -d %{buildroot}%{_datadir}/%{name}
|
||||||
|
install -d %{buildroot}%{_libexecdir}/%{name}
|
||||||
|
cp -a conf public plugins-bundled %{buildroot}%{_datadir}/%{name}
|
||||||
|
|
||||||
|
# wrappers
|
||||||
|
install -p -m 755 packaging/wrappers/grafana-cli %{buildroot}%{_sbindir}/%{name}-cli
|
||||||
|
|
||||||
|
# binaries
|
||||||
|
install -p -m 755 %{_builddir}/bin/%{name}-server %{buildroot}%{_sbindir}
|
||||||
|
install -p -m 755 %{_builddir}/bin/%{name}-cli %{buildroot}%{_libexecdir}/%{name}
|
||||||
|
|
||||||
|
# man pages
|
||||||
|
install -d %{buildroot}%{_mandir}/man1
|
||||||
|
install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1
|
||||||
|
|
||||||
|
# config dirs
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/%{name}
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/dashboards
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/datasources
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/notifiers
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/plugins
|
||||||
|
install -d %{buildroot}%{_sysconfdir}/sysconfig
|
||||||
|
|
||||||
|
# config defaults
|
||||||
|
install -p -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/grafana.ini
|
||||||
|
install -p -m 640 conf/ldap.toml %{buildroot}%{_sysconfdir}/%{name}/ldap.toml
|
||||||
|
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/conf/defaults.ini
|
||||||
|
install -p -m 644 packaging/rpm/sysconfig/grafana-server \
|
||||||
|
%{buildroot}%{_sysconfdir}/sysconfig/grafana-server
|
||||||
|
|
||||||
|
# config database directory and plugins
|
||||||
|
install -d -m 750 %{buildroot}%{_sharedstatedir}/%{name}
|
||||||
|
install -d -m 755 %{buildroot}%{_sharedstatedir}/%{name}/plugins
|
||||||
|
|
||||||
|
# log directory
|
||||||
|
install -d %{buildroot}%{_localstatedir}/log/%{name}
|
||||||
|
|
||||||
|
# systemd service files
|
||||||
|
install -d %{buildroot}%{_unitdir} # only needed for manual rpmbuilds
|
||||||
|
install -p -m 644 packaging/rpm/systemd/grafana-server.service \
|
||||||
|
%{buildroot}%{_unitdir}
|
||||||
|
|
||||||
|
# daemon run pid file config for using tmpfs
|
||||||
|
install -d %{buildroot}%{_tmpfilesdir}
|
||||||
|
echo "d %{_rundir}/%{name} 0755 %{GRAFANA_USER} %{GRAFANA_GROUP} -" \
|
||||||
|
> %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
|
%pre
|
||||||
|
getent group %{GRAFANA_GROUP} >/dev/null || groupadd -r %{GRAFANA_GROUP}
|
||||||
|
getent passwd %{GRAFANA_USER} >/dev/null || \
|
||||||
|
useradd -r -g %{GRAFANA_GROUP} -d %{GRAFANA_HOME} -s /sbin/nologin \
|
||||||
|
-c "%{GRAFANA_USER} user account" %{GRAFANA_USER}
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
%preun
|
||||||
|
%systemd_preun grafana-server.service
|
||||||
|
|
||||||
|
%post
|
||||||
|
%systemd_post grafana-server.service
|
||||||
|
# create grafana.db with secure permissions on new installations
|
||||||
|
# otherwise grafana-server is creating grafana.db on first start
|
||||||
|
# with world-readable permissions, which may leak encrypted datasource
|
||||||
|
# passwords to all users (if the secret_key in grafana.ini was not changed)
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1805472
|
||||||
|
if [ "$1" = 1 ] && [ ! -f %{_sharedstatedir}/%{name}/grafana.db ]; then
|
||||||
|
touch %{_sharedstatedir}/%{name}/grafana.db
|
||||||
|
fi
|
||||||
|
|
||||||
|
# apply secure permissions to grafana.db if it exists
|
||||||
|
# (may not exist on upgrades, because users can choose between sqlite/mysql/postgres)
|
||||||
|
if [ -f %{_sharedstatedir}/%{name}/grafana.db ]; then
|
||||||
|
chown %{GRAFANA_USER}:%{GRAFANA_GROUP} %{_sharedstatedir}/%{name}/grafana.db
|
||||||
|
chmod 640 %{_sharedstatedir}/%{name}/grafana.db
|
||||||
|
fi
|
||||||
|
|
||||||
|
# required for upgrades
|
||||||
|
chmod 640 %{_sysconfdir}/%{name}/grafana.ini
|
||||||
|
chmod 640 %{_sysconfdir}/%{name}/ldap.toml
|
||||||
|
|
||||||
|
%postun
|
||||||
|
%systemd_postun_with_restart grafana-server.service
|
||||||
|
|
||||||
|
|
||||||
|
%check
|
||||||
|
cd %{_builddir}/src/github.com/grafana/grafana
|
||||||
|
export GOPATH=%{_builddir}
|
||||||
|
# remove tests currently failing - these two are due to a symlink
|
||||||
|
# BUILD/src/github.com/grafana/grafana -> BUILD/grafana-6.6.1
|
||||||
|
rm -f pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
||||||
|
rm -f pkg/services/provisioning/dashboards/file_reader_test.go
|
||||||
|
%gotest ./pkg/...
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
# binaries and wrappers
|
||||||
|
%{_sbindir}/%{name}-server
|
||||||
|
%{_sbindir}/%{name}-cli
|
||||||
|
%{_libexecdir}/%{name}
|
||||||
|
|
||||||
|
# config files
|
||||||
|
%dir %{_sysconfdir}/%{name}
|
||||||
|
%attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning
|
||||||
|
%attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/dashboards
|
||||||
|
%attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/datasources
|
||||||
|
%attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/notifiers
|
||||||
|
%attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/plugins
|
||||||
|
%config(noreplace) %attr(0640, root, %{GRAFANA_GROUP}) %{_sysconfdir}/%{name}/grafana.ini
|
||||||
|
%config(noreplace) %attr(0640, root, %{GRAFANA_GROUP}) %{_sysconfdir}/%{name}/ldap.toml
|
||||||
|
%config(noreplace) %{_sysconfdir}/sysconfig/grafana-server
|
||||||
|
|
||||||
|
# Grafana configuration to dynamically create /run/grafana/grafana.pid on tmpfs
|
||||||
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
|
# config database directory and plugins
|
||||||
|
%attr(0750, %{GRAFANA_USER}, %{GRAFANA_GROUP}) %dir %{_sharedstatedir}/%{name}
|
||||||
|
%attr(-, %{GRAFANA_USER}, %{GRAFANA_GROUP}) %dir %{_sharedstatedir}/%{name}/plugins
|
||||||
|
|
||||||
|
# shared directory and all files therein
|
||||||
|
%{_datadir}/%{name}
|
||||||
|
%attr(-, root, %{GRAFANA_GROUP}) %{_datadir}/%{name}/conf/*
|
||||||
|
|
||||||
|
# systemd service file
|
||||||
|
%{_unitdir}/grafana-server.service
|
||||||
|
|
||||||
|
# log directory - grafana.log is created by grafana-server, and it does it's own log rotation
|
||||||
|
%attr(0755, %{GRAFANA_USER}, %{GRAFANA_GROUP}) %dir %{_localstatedir}/log/%{name}
|
||||||
|
|
||||||
|
# man pages for grafana binaries
|
||||||
|
%{_mandir}/man1/%{name}-server.1*
|
||||||
|
%{_mandir}/man1/%{name}-cli.1*
|
||||||
|
|
||||||
|
# other docs and license
|
||||||
|
%license LICENSE
|
||||||
|
%doc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md ISSUE_TRIAGE.md MAINTAINERS.md NOTICE.md
|
||||||
|
%doc PLUGIN_DEV.md README.md ROADMAP.md SECURITY.md SUPPORT.md UPGRADING_DEPENDENCIES.md WORKFLOW.md
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-2
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 30 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 7.1.1-1
|
||||||
|
- update to 7.1.1 tagged upstream community sources, see CHANGELOG
|
||||||
|
- merge all datasources into main grafana package
|
||||||
|
- bundle golang dependencies
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 05 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-1
|
||||||
|
- update to 6.7.4 tagged upstream community sources, see CHANGELOG
|
||||||
|
- security fix for CVE-2020-13379
|
||||||
|
|
||||||
|
* Tue Apr 28 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.3-1
|
||||||
|
- update to 6.7.3 tagged upstream community sources, see CHANGELOG
|
||||||
|
- add scripts to list Go dependencies and bundled npmjs dependencies
|
||||||
|
- set Grafana version in Grafana UI and grafana-cli --version
|
||||||
|
- declare README.md as documentation of datasource plugins
|
||||||
|
- create grafana.db on first installation (fixes RH BZ #1805472)
|
||||||
|
- change permissions of /var/lib/grafana to 750 (CVE-2020-12458)
|
||||||
|
- change permissions of /var/lib/grafana/grafana.db to 640 and
|
||||||
|
user/group grafana:grafana (CVE-2020-12458)
|
||||||
|
- change permissions of grafana.ini and ldap.toml to 640 (CVE-2020-12459)
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- added several patches for golang vendored vrs build dep differences
|
||||||
|
- added patch to move grafana-cli binary to libexec dir
|
||||||
|
- update to 6.6.2 tagged upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Wed Nov 20 2019 Mark Goodwin <mgoodwin@redhat.com> 6.3.6-1
|
||||||
|
- add weak depenency on grafana-pcp
|
||||||
|
- add patch to mute shellcheck SC1090 for grafana-cli
|
||||||
|
- update to 6.3.6 upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Thu Sep 05 2019 Mark Goodwin <mgoodwin@redhat.com> 6.3.5-1
|
||||||
|
- drop uaparser patch now it's upstream
|
||||||
|
- add xerrors patch, see https://github.com/golang/go/issues/32246
|
||||||
|
- use vendor sources on rawhide until modules are fully supported
|
||||||
|
- update to latest upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Fri Aug 30 2019 Mark Goodwin <mgoodwin@redhat.com> 6.3.4-1
|
||||||
|
- include fix for CVE-2019-15043
|
||||||
|
- add patch for uaparser on 32bit systems
|
||||||
|
- update to latest upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Wed Jul 31 2019 Mark Goodwin <mgoodwin@redhat.com> 6.2.5-1
|
||||||
|
- update to latest upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 07 2019 Mark Goodwin <mgoodwin@redhat.com> 6.2.2-1
|
||||||
|
- split out some datasource plugins to sub-packages
|
||||||
|
- update to latest upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Wed Jun 05 2019 Mark Goodwin <mgoodwin@redhat.com> 6.2.1-1
|
||||||
|
- update to latest upstream community sources, see CHANGELOG
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mark Goodwin <mgoodwin@redhat.com> 6.2.0-1
|
||||||
|
- update to latest upstream community sources
|
||||||
|
- drop a couple of patches
|
||||||
|
|
||||||
|
* Wed May 08 2019 Mark Goodwin <mgoodwin@redhat.com> 6.1.6-2
|
||||||
|
- add conditional unbundle_vendor_sources macro
|
||||||
|
|
||||||
|
* Tue Apr 30 2019 Mark Goodwin <mgoodwin@redhat.com> 6.1.6-1
|
||||||
|
- update to latest upstream stable release 6.1.6, see CHANGELOG
|
||||||
|
- includes jQuery 3.4.0 security update
|
||||||
|
|
||||||
|
* Wed Apr 24 2019 Mark Goodwin <mgoodwin@redhat.com> 6.1.4-1
|
||||||
|
- update to latest upstream stable release 6.1.4, see CHANGELOG
|
||||||
|
- use gobuild and gochecks macros, eliminate arch symlinks
|
||||||
|
- re-enable grafana-debugsource package
|
||||||
|
- fix GRAFANA_GROUP typo
|
||||||
|
- fix more modes for brp-mangle-shebangs
|
||||||
|
- vendor source unbundling now done in prep after patches
|
||||||
|
- remove all rhel and fedora conditional guff
|
||||||
|
|
||||||
|
* Tue Apr 16 2019 Mark Goodwin <mgoodwin@redhat.com> 6.1.3-1
|
||||||
|
- update to latest upstream stable release 6.1.3, see CHANGELOG
|
||||||
|
- unbundle all vendor sources, replace with BuildRequires, see
|
||||||
|
the long list of blocker BZs linked to BZ#1670656
|
||||||
|
- BuildRequires go-plugin >= v1.0.0 for grpc_broker (thanks eclipseo)
|
||||||
|
- tweak make_webpack to no longer use grunt, switch to prod build
|
||||||
|
- add ExclusiveArch lua script (thanks quantum.analyst)
|
||||||
|
- move db directory and plugins to /var/lib/grafana
|
||||||
|
- split out into 6 patches, ready for upstream PRs
|
||||||
|
- add check to run go tests for gating checks
|
||||||
|
|
||||||
|
* Thu Apr 04 2019 Mark Goodwin <mgoodwin@redhat.com> 6.1.0-1
|
||||||
|
- update to latest upstream stable release 6.1.0, see CHANGELOG
|
||||||
|
|
||||||
|
* Thu Mar 21 2019 Mark Goodwin <mgoodwin@redhat.com> 6.0.2-1
|
||||||
|
- bump to latest upstream stable release 6.0.2-1
|
||||||
|
- unbundle almost all remaining vendor code, see linked blockers in BZ#1670656
|
||||||
|
|
||||||
|
* Fri Mar 15 2019 Mark Goodwin <mgoodwin@redhat.com> 6.0.1-3
|
||||||
|
- bump to latest upstream stable release 6.0.1-1
|
||||||
|
|
||||||
|
* Thu Mar 14 2019 Mark Goodwin <mgoodwin@redhat.com> 6.0.1-2
|
||||||
|
- unbundle and add BuildRequires for golang-github-rainycape-unidecode-devel
|
||||||
|
|
||||||
|
* Thu Mar 07 2019 Mark Goodwin <mgoodwin@redhat.com> 6.0.1-1
|
||||||
|
- update to v6.0.1 upstream sources, tweak distro config, re-do patch
|
||||||
|
- simplify make_webpack.sh script (Elliott Sales de Andrade)
|
||||||
|
- vendor/github.com/go-ldap is now gone, so don't unbundle it
|
||||||
|
|
||||||
|
* Thu Mar 07 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-11
|
||||||
|
- tweak after latest feedback, bump to 5.4.3-11 (BZ 1670656)
|
||||||
|
- build debuginfo package again
|
||||||
|
- unbundle BuildRequires for golang-github-hashicorp-version-devel
|
||||||
|
- remove some unneeded development files
|
||||||
|
- remove macros from changelog and other rpmlint tweaks
|
||||||
|
|
||||||
|
* Fri Feb 22 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-10
|
||||||
|
- tweak spec for available and unavailable (bundled) golang packages
|
||||||
|
|
||||||
|
* Wed Feb 20 2019 Xavier Bachelot <xavier@bachelot.org> 5.4.3-9
|
||||||
|
- Remove extraneous slash (cosmetic)
|
||||||
|
- Create directories just before moving stuff in them
|
||||||
|
- Truncate long lines
|
||||||
|
- Group all golang stuff
|
||||||
|
- Simplify BuildRequires/bundled Provides
|
||||||
|
- Sort BuildRequires/bundled Provides
|
||||||
|
- Fix bundled go packages Provides
|
||||||
|
|
||||||
|
* Fri Feb 15 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-8
|
||||||
|
- add BuildRequires (and unbundle) vendor sources available in Fedora
|
||||||
|
- declare Provides for remaining (bundled) vendor go sources
|
||||||
|
- do not attempt to unbundle anything on RHEL < 7 or Fedora < 28
|
||||||
|
|
||||||
|
* Thu Feb 07 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-7
|
||||||
|
- further refinement for spec doc section from Xavier Bachelot
|
||||||
|
- disable debug_package to avoid empty debugsourcefiles.list
|
||||||
|
|
||||||
|
* Wed Feb 06 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-6
|
||||||
|
- further refinement following review by Xavier Bachelot
|
||||||
|
|
||||||
|
* Tue Feb 05 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-5
|
||||||
|
- further refinement following review by Xavier Bachelot
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-4
|
||||||
|
- further spec updates after packaging review
|
||||||
|
- reworked post-install scriplets
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-3
|
||||||
|
- tweak FHS patch, update spec after packaging review
|
||||||
|
|
||||||
|
* Wed Jan 30 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.3-2
|
||||||
|
- add patch to be standard FHS compliant, remove phantomjs
|
||||||
|
- update to v5.4.3 upstream community sources
|
||||||
|
|
||||||
|
* Wed Jan 09 2019 Mark Goodwin <mgoodwin@redhat.com> 5.4.2-1
|
||||||
|
- update to v5.4.2 upstream community sources
|
||||||
|
|
||||||
|
* Thu Oct 18 2018 Mark Goodwin <mgoodwin@redhat.com> 5.3.1-1
|
||||||
|
- update to v5.3.1 upstream community sources
|
||||||
|
|
||||||
|
* Tue Oct 02 2018 Mark Goodwin <mgoodwin@redhat.com> 5.2.5-1
|
||||||
|
- native RPM spec build with current tagged v5.2.5 sources
|
||||||
23
run_container_build.sh
Executable file
23
run_container_build.sh
Executable file
@ -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 distro-defaults.ini Makefile create_webpack_manifest.py /grafana
|
||||||
|
WORKDIR /grafana
|
||||||
|
RUN dnf -y builddep grafana.spec
|
||||||
|
RUN rpkg local
|
||||||
|
EOF
|
||||||
3
sources
Normal file
3
sources
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
SHA512 (grafana-7.1.1.tar.gz) = 487322d6d26cdc1ce6fc03719ded482380c2be4bb01279367ff166b2bc9e3ca7691edc32a6c42bb9a64eb39d6620ca47855786e259dbfeb636585add5e1fe5b0
|
||||||
|
SHA512 (grafana-vendor-7.1.1.tar.gz) = 966ec92abdd644e4a189e8c381c0ffc6e54995983ae4746eee183cdc65a6817e3368faf1366990795cb18299fe8a9883257ba7e2b7b5f24db0631e16ae223884
|
||||||
|
SHA512 (grafana-webpack-7.1.1.tar.gz) = 5e271ecd9539dba4f902d3c2a14e5deb5b0f1fa686d20bf6ac3db11af54c6571477a56d270dae9c43f374c485c7cdc48155acfdeb7428ac3a1a09dd6abc71d90
|
||||||
Loading…
Reference in New Issue
Block a user