Commit Graph

275 Commits

Author SHA1 Message Date
Azat Bahawi
6c4f7960cd
grafanaPlugins.redis-app: init at 2.2.1 2023-03-23 21:35:34 +03:00
Azat Bahawi
7c48c824bd
grafanaPlugins.redis-datasource: init at 2.1.1 2023-03-23 21:35:05 +03:00
Maximilian Bosch
841417745c
grafana: 9.4.3 -> 9.4.7
Sadly, upstream doesn't publish proper changelogs anymore[1] and there's
also quite a gap - this is the first time a release was published for
9.4.x since 9.4.3, so I decided to skim through the commit log on my own[2].

While there are no apparent problematic changes for us, but only
bugfixes, internal changes and a few doc fixes, I found at least one
security patch[3] fixing XSS in the graphite datasource settings, hence
the corresponding PR will get a security label.

[1] https://github.com/grafana/grafana/releases/tag/v9.4.7
    / adcdf190bb
[2] https://github.com/grafana/grafana/compare/v9.4.3...v9.4.7
[3] ef2eb2b6bf
2023-03-22 23:28:30 +01:00
apfelkuchen06
74a016a390 grafanaPlugins.grafana-worldmap-panel: 0.3.3 -> 1.0.3 2023-03-04 23:29:51 +01:00
apfelkuchen06
e1b95e17f8 grafanaPlugins.grafana-polystat-panel 1.2.6 -> 2.0.4 2023-03-04 23:29:31 +01:00
apfelkuchen06
4d9be6400d grafanaPlugins.grafana-piechart-panel: 1.6.2 -> 1.6.4 2023-03-04 23:29:14 +01:00
apfelkuchen06
00fa8622d5 grafanaPlugins.grafana-clock-panel: 1.1.3 -> 2.1.2 2023-03-04 23:28:45 +01:00
apfelkuchen06
b7660ff3fd grafanaPlugins.grafadruid-druid-datasource: 1.2.0 -> 1.4.1 2023-03-04 23:28:08 +01:00
apfelkuchen06
5870c51c4c grafanaPlugins.doitintl-bigquery-datasource: 2.0.2 -> 2.0.3 2023-03-04 23:27:45 +01:00
Maximilian Bosch
c016144591
grafana: 9.4.2 -> 9.4.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.4.3
2023-03-04 10:57:56 +01:00
Maximilian Bosch
ae5eab6d59
grafana: 9.3.6 -> 9.4.2
ChangeLog: ae90f73b78/CHANGELOG.md (942-2023-03-02)

Also synced up the `go generate` calls from upstream's Makefile
with our buildscript.

Finally, I removed the `go.{mod,sum}` files from the vendored `xorm` in
`pkg/util`. This was to work around the following build error:

    main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm

Not entirely sure why, but I guess that the presence of these files
confused our build-script and it wrongly assumed that
github.com/grafana/.../xorm didn't exist (while a different xorm
according to the values in `go.mod` existed).
2023-03-02 12:08:29 +01:00
Minijackson
13352dbafc
grafana: 9.3.1 -> 9.3.6
fixes CVE-2022-23552, CVE-2022-41912, and CVE-2022-39324
2023-01-29 13:33:03 +01:00
Maximilian Bosch
9331816ed8
grafana: 9.2.6 -> 9.3.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.3.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.3.1
2022-12-03 21:39:29 +01:00
Sergey Lukjanov
9fef864d5f grafana: 9.2.5 -> 9.2.6
https://github.com/grafana/grafana/releases/tag/v9.2.6
2022-11-23 13:57:45 -08:00
Maximilian Bosch
9efa42244c
grafana: 9.2.4 -> 9.2.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.5
2022-11-17 22:17:33 +01:00
Maximilian Bosch
79a49c2a66
grafana: 9.2.3 -> 9.2.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.4
2022-11-09 08:11:05 +01:00
Maximilian Bosch
d2d68fb1f9
grafana: 9.2.2 -> 9.2.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.3

Also slightly security relevant: updates x/text to 0.4 which is not
affected by CVE-2022-32149.
2022-11-05 18:58:29 +01:00
Maximilian Bosch
725918a71f
grafana: 9.2.1 -> 9.2.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.2
2022-10-27 21:42:59 +02:00
Maximilian Bosch
15472b7447
grafana: 9.2.0 -> 9.2.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.1
2022-10-21 15:26:27 +02:00
Maximilian Bosch
955e01095a
grafana: 9.1.7 -> 9.2.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.0

Also fixed the test: the default value for the admin email address is
now `admin@localhost`[1].

[1] 39102c6656
2022-10-12 20:45:15 +02:00
Maximilian Bosch
4f471a0845
grafana: 9.1.6 -> 9.1.7
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.7
2022-10-06 21:12:36 +02:00
Maximilian Bosch
ee08af170b
grafana: 9.1.5 -> 9.1.6, fix CVE-2022-35957 & CVE-2022-36062
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.6
2022-09-22 11:41:36 +02:00
Maximilian Bosch
9c35dd41c9
grafana: 9.1.4 -> 9.1.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.5
2022-09-17 19:05:06 +02:00
Maximilian Bosch
af6d3f556f
grafana: 9.1.3 -> 9.1.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.4
2022-09-10 10:20:00 +02:00
Maximilian Bosch
ecf58409a2
grafana: 9.1.2 -> 9.1.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.3
2022-09-06 15:32:13 +02:00
Pierre Bourdon
9f1a83ccc7
grafana: 9.1.1 -> 9.1.2 (CVE-2022-31176) 2022-08-31 01:42:55 +02:00
Franz Pletz
ddd2ac13a1
Merge pull request #188130 from squalus/grafana 2022-08-29 14:55:34 +02:00
Maximilian Bosch
b9cc5b8797 grafana: 9.1.0 -> 9.1.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.1
2022-08-24 12:32:26 +02:00
squalus
78b312a895 grafana: fix cross compile
Change the generate step to run correctly on the build system
2022-08-23 23:58:05 -07:00
Maximilian Bosch
962766009d
grafana: 9.0.7 -> 9.1.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.0
2022-08-17 11:23:50 +02:00
Maximilian Bosch
6bfdf1f074
grafana: 9.0.6 -> 9.0.7
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.7
2022-08-11 14:19:28 +02:00
Maximilian Bosch
269c5e21cb
grafana: 9.0.5 -> 9.0.6
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.6
2022-08-02 20:15:42 +02:00
Maximilian Bosch
8dabfb103f
grafana: 9.0.4 -> 9.0.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.5
2022-07-29 20:21:06 +02:00
Maximilian Bosch
ffdf4f9d5f
grafana: 9.0.3 -> 9.0.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.4
2022-07-23 06:34:50 +02:00
Wanja Hentze
9875176906 grafana: 9.0.2 -> 9.0.3
Announcement and security advisory: https://grafana.com/blog/2022/07/14/grafana-v9-0-3-8-5-9-8-4-10-and-8-3-10-released-with-high-severity-security-fix/
2022-07-15 12:24:07 +02:00
Maximilian Bosch
0a6483ce41
grafana: 9.0.1 -> 9.0.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.2
2022-06-29 11:41:10 +02:00
Maximilian Bosch
fe77acb141
grafana: 9.0.0 -> 9.0.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.1
2022-06-24 12:42:54 +02:00
Maximilian Bosch
73b80e832e
grafana: 8.5.5 -> 9.0.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.0
2022-06-16 16:14:34 +02:00
Maximilian Bosch
df0b326d75
grafana: 8.5.3 -> 8.5.5
ChangeLogs:
* https://github.com/grafana/grafana/releases/tag/v8.5.4
* https://github.com/grafana/grafana/releases/tag/v8.5.5
2022-06-12 23:11:25 +02:00
Maximilian Bosch
15799c4ea8
grafana: 8.5.2 -> 8.5.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.5.3
Fixes CVE-2022-29170
2022-05-20 12:32:14 +02:00
Maximilian Bosch
128644de07
grafana: 8.5.1 -> 8.5.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.5.2
2022-05-13 20:09:47 +02:00
Maximilian Bosch
35a36a5122
grafana: 8.5.0 -> 8.5.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.5.1
2022-04-28 15:50:23 +02:00
Maximilian Bosch
0eec6b710b
grafana: 8.4.7 -> 8.5.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.5.0
2022-04-22 10:38:53 +02:00
Maximilian Bosch
12e2fb8418
grafana: 8.4.6 -> 8.4.7
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.7
2022-04-21 15:00:54 +02:00
Maximilian Bosch
e633d42747
grafana: 8.4.5 -> 8.4.6
No-op release: https://github.com/grafana/grafana/releases/tag/v8.4.6

Yes, this is actually not really needed since we only provide the OSS
version of Grafana and the CVE in question is only exploitable on
Grafana enterprise, but I decided to perform this update to test the
update script I previously implemented in 7708fccf01.
2022-04-14 11:29:19 +02:00
Maximilian Bosch
7708fccf01
grafana: implement update script 2022-04-14 10:58:50 +02:00
github-actions[bot]
8b4f11bb87
Merge master into staging-next 2022-04-02 00:02:09 +00:00
Maximilian Bosch
bab7f65636
grafana: 8.4.4 -> 8.4.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.5
2022-03-31 20:45:55 +02:00
Martin Weinelt
f4f3622cb1 Merge remote-tracking branch 'origin/staging-next' into staging 2022-03-20 00:00:32 +01:00
Maximilian Bosch
bee12c4c5e
grafana: 8.4.3 -> 8.4.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.4
2022-03-17 20:09:17 +01:00
github-actions[bot]
fade30f7b2
Merge staging-next into staging 2022-03-05 12:01:44 +00:00
Manuel Mendez
10d3e3a0f4 go: convert alternating regex string to list of packages to exclude
This is just easier to read.
2022-03-04 13:32:44 +10:00
Maximilian Bosch
a7b6e8bc6e
grafana: 8.4.2 -> 8.4.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.3
2022-03-03 15:27:32 +01:00
Maximilian Bosch
8b9fc0e6ab
grafana: 8.4.1 -> 8.4.2
ChangeLog: https://github.com/grafana/grafana/releases/v8.4.2
2022-02-24 22:15:00 +01:00
Maximilian Bosch
3ebd1d226f
grafana: 8.3.6 -> 8.4.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.4.1
2022-02-18 16:45:15 +01:00
Martin Weinelt
f7364c195c
grafana: 8.3.5 -> 8.3.6 2022-02-09 19:33:32 +01:00
Franz Pletz
94c73cb74f
grafana: 8.3.4 -> 8.3.5
https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes

Fixes CVE-2022-21702, CVE-2022-21703, CVE-2022-21713.
2022-02-09 14:38:07 +01:00
zowoq
ab07e12988 treewide: drop unnecessary go_1_17, buildGo117{Module,Package} 2022-02-08 08:09:33 +10:00
Maximilian Bosch
b1a80228a6
grafana: 8.3.3 -> 8.3.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.4
2022-01-21 11:05:02 +01:00
Maximilian Bosch
8af12f8ebd
grafana: 8.3.2 -> 8.3.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.3

Note: I had to copy `defaults.ini` from the Git repo rather than from
`srcStatic`. This is because the `srcStatic`-variant missed some config
changes[1] which caused the test to fail like this:

    postgresql # [   24.754735] grafana-start[900]: Failed to start grafana. error: section "tracing.opentelemetry.jaeger" does not exist
    postgresql # [   24.756013] grafana-start[900]: section "tracing.opentelemetry.jaeger" does not exist
    postgresql # [   24.762057] systemd[1]: grafana.service: Main process exited, code=exited, status=1/FAILURE
    postgresql # [   24.765443] systemd[1]: grafana.service: Failed with result 'exit-code'.
    postgresql # [   24.767419] systemd[1]: grafana.service: Consumed 1.598s CPU time, no IP traffic.

[1] d993b12415 (diff-0c326c4f02797b088fc566e64fbfe2162390f52f2fec1483ec3a413a7f11c910)
2021-12-19 15:44:17 +01:00
Maximilian Bosch
3c8f6c5407
grafana: 8.3.1 -> 8.3.2, fix CVE-2021-43813, CVE-2021-43815
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.2
2021-12-12 13:04:35 +01:00
Thomas Gerbet
b207a9d87d grafana: 8.3.0 -> 8.3.1
Fixes CVE-2021-43798.
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-3-1/
2021-12-07 18:52:51 +01:00
Maximilian Bosch
05f3d0b587
grafana: 8.2.5 -> 8.3.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.0
2021-12-02 17:24:19 +01:00
Maximilian Bosch
0eddc8707d
grafana: 8.2.4 -> 8.2.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.2.5
2021-11-21 20:54:57 +01:00
Maximilian Bosch
d635496f3a
grafana: 8.2.3 -> 8.2.4, fix CVE-2021-41244 (#146164)
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.2.4
2021-11-15 18:27:25 +01:00
Maximilian Bosch
7733d9cae9
grafana: 8.1.6 -> 8.2.3, fix CVE-2021-41174
ChangeLogs:
* https://github.com/grafana/grafana/releases/tag/v8.1.7
* https://github.com/grafana/grafana/releases/tag/v8.2.0
* https://github.com/grafana/grafana/releases/tag/v8.2.1
* https://github.com/grafana/grafana/releases/tag/v8.2.2
* https://github.com/grafana/grafana/releases/tag/v8.2.3

Apart from a few new features, most notably is CVE-2021-41174[1]. Darwin
is temporarily marked as unsupported because Go 1.17 doesn't support the
Apple SDK versions used in `nixpkgs`.

[1] https://nvd.nist.gov/vuln/detail/CVE-2021-41174
2021-11-06 23:30:50 +01:00
Thomas Gerbet
471c673d71 grafana: 8.1.5 -> 8.1.6
Fixes CVE-2021-39226.
https://grafana.com/blog/2021/10/05/grafana-7.5.11-and-8.1.6-released-with-critical-security-fix/
2021-10-06 08:14:34 +02:00
Maximilian Bosch
d321f8ba39
grafana: 8.1.4 -> 8.1.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.1.5
2021-09-21 16:04:53 +02:00
Maximilian Bosch
72a064fb98
grafana: 8.1.3 -> 8.1.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.1.4
2021-09-16 17:01:51 +02:00
Maximilian Bosch
427403fc3b
grafana: 8.1.2 -> 8.1.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.1.3
2021-09-08 17:44:42 +02:00
Kira Bruneau
8666c95a0e grafana: add meta.mainProgram 2021-09-05 16:41:57 -04:00
Kira Bruneau
a7bf9ea8b5 grafana: support darwin 2021-09-04 13:27:07 -04:00
zowoq
13ea123c74 treewide: buildFlagsArray -> ldflags 2021-08-26 21:35:06 +10:00
Leo Maroni
1775c0bf12
grafana: 8.1.1 -> 8.1.2 2021-08-20 09:13:45 +02:00
Maximilian Bosch
314fa1c0e6 grafana: 8.1.0 -> 8.1.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.1.1
2021-08-11 11:07:44 +09:00
Maximilian Bosch
93644ca084 grafana: 8.0.6 -> 8.1.0
ChangeLogs:
* https://github.com/grafana/grafana/releases/tag/v8.1.0
* https://github.com/grafana/grafana/releases/tag/v8.1.0-beta3
* https://github.com/grafana/grafana/releases/tag/v8.1.0-beta2
* https://github.com/grafana/grafana/releases/tag/v8.1.0-beta1
2021-08-07 20:35:54 +09:00
Kartik Gokte
db90da3482 grafanaPlugins.grafadruid-druid-datasource: init at 1.2.0 2021-07-30 18:28:14 +05:30
Jörg Thalheim
e474a9cc07
Merge pull request #131143 from lukegb/grafana-plugins
grafanaPlugins.grafana-polystat-panel: 1.2.5 → 1.2.6
2021-07-23 06:38:22 +01:00
Thomas Gerbet
f0d8e047dd grafana: 8.0.5 -> 8.0.6 2021-07-22 18:57:48 +02:00
Luke Granger-Brown
e54f4b1b04 grafanaPlugins.grafana-polystat-panel: 1.2.5 → 1.2.6 2021-07-15 10:18:00 +00:00
Maximilian Bosch
8029f0de96
grafana: 8.0.4 -> 8.0.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.5
2021-07-08 19:15:16 +02:00
Luke Granger-Brown
f930ea227c
Merge pull request #129237 from lukegb/grafana-plugins
grafanaPlugins: update
2021-07-04 13:53:55 +01:00
Maximilian Bosch
5ec4668732
grafana: 8.0.3 -> 8.0.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.4
2021-07-01 18:19:16 +02:00
Luke Granger-Brown
f1e81de38c grafanaPlugins.doitintl-bigquery-datasource: 2.0.1 → 2.0.2 2021-07-01 10:17:45 +00:00
Luke Granger-Brown
5bc45b51d0 grafanaPlugins.grafana-polystat-panel: 1.2.4 → 1.2.5 2021-06-27 10:18:02 +00:00
Maximilian Bosch
ae541afbf9
grafana: 8.0.2 -> 8.0.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.3
2021-06-18 20:21:12 +02:00
Luke Granger-Brown
874dc9e411 grafanaPlugins.grafana-polystat-panel: 1.2.3 → 1.2.4 2021-06-18 10:18:12 +00:00
Luke Granger-Brown
e32dc55ffa grafanaPlugins.grafana-worldmap-panel: 0.3.2 → 0.3.3 2021-06-17 16:04:27 +00:00
Luke Granger-Brown
cd48bd0f9a grafanaPlugins.grafana-piechart-panel: 1.6.1 → 1.6.2 2021-06-17 16:04:26 +00:00
Luke Granger-Brown
c444468ff6 grafanaPlugins.grafana-worldmap-panel: fix meta.license 2021-06-17 16:04:26 +00:00
Luke Granger-Brown
f605757f38 grafanaPlugins.grafana-piechart-panel: fix meta.license 2021-06-17 16:04:25 +00:00
Luke Granger-Brown
8cb2782859 grafanaPlugins.grafana-clock-panel: fix meta.license 2021-06-17 16:04:25 +00:00
Maximilian Bosch
5754093352
grafana: skip a flaky test 2021-06-15 22:32:40 +02:00
Maximilian Bosch
36b379bd8b
grafanaPlugins.grafana-clock-panel: 1.1.1 -> 1.1.3 2021-06-15 12:17:13 +02:00
Maximilian Bosch
9f20e57d40
grafana: 8.0.1 -> 8.0.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.2
2021-06-15 12:16:55 +02:00
Maximilian Bosch
df6d55ce69
grafana: 8.0.0 -> 8.0.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.1

Also correctly set the version in the UI by declaring `-X main.version`.
2021-06-11 11:34:42 +02:00
蛇崩乃音
1c29784978 grafana: updated license to AGPLv3
See: 8db3eb90ae
2021-06-09 23:30:15 +02:00
Maximilian Bosch
9febe63ae6
grafana: 7.5.7 -> 8.0.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.0

Also had to skip one of the plugin tests as it tried to access
grafana.com (test-failure is documented as comment in `preBuild`).
2021-06-09 00:39:56 +02:00
Maximilian Bosch
86ee847aaf
grafana: 7.5.6 -> 7.5.7
ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.7
2021-05-21 19:04:36 +02:00
Tobias Stenzel
ac582ccd61 grafana: 7.5.2 -> 7.5.6
Changelog:

* https://github.com/grafana/grafana/releases/tag/v7.5.3
* https://github.com/grafana/grafana/releases/tag/v7.5.4
* https://github.com/grafana/grafana/releases/tag/v7.5.5
* https://github.com/grafana/grafana/releases/tag/v7.5.6
2021-05-18 23:07:09 +02:00