Commit Graph

277 Commits

Author SHA1 Message Date
Yureka
9da3476b42 remove myself from a bunch of maintainer roles 2024-04-27 13:56:45 +02:00
Maximilian Bosch
9d0e0a6ea3
grafana: 10.4.1 -> 10.4.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.4.2
2024-04-12 16:55:56 +02:00
Maximilian Bosch
9b6607a97e
grafana: 10.4.0 -> 10.4.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.4.1
2024-03-26 18:10:10 +01:00
Maximilian Bosch
9d41ef1e52
Merge pull request #297968 from shivaraj-bh/fix/grafana-darwin
grafana: fix build failure on darwin
2024-03-26 16:56:33 +00:00
shivaraj-bh
af60144b41 grafana: supports x86_64-{linux, darwin} and aarch64-{linux, darwin} only 2024-03-26 17:55:23 +05:30
shivaraj-bh
f5e484111e grafana: fix the darwin build failure
* use xcbuild.xcbuild, which is dep for @esfx/equatable; fix 'aligned_alloc' error

* frontend's offlineCache: don't allow platforms other than the one's mentioned in `meta.platforms`
2024-03-26 13:03:23 +05:30
Jussi Kuokkanen
82b45bf454 treewide: remove licenses.agpl3 2024-03-21 18:09:24 +02:00
K900
e205dddc33 grafana: don't try to run a file that doesn't exist
I don't know why it worked before, but that file very much does not exist.
2024-03-19 14:02:57 +03:00
Maximilian Bosch
bd55d69cc0
grafana: clean up
We're currently not executing any tests by specifying `subPackages`
explicitly. If we go back to doing that, this can be reverted, but for
now it's just dead code.
2024-03-15 17:42:51 +01:00
Maximilian Bosch
66dece7b0e
grafana: 10.3.4 -> 10.4.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.4.0
2024-03-15 17:42:47 +01:00
Maximilian Bosch
1fab653a34
grafana: explicitly declare subPackages
The build itself is pretty quick now:

    buildPhase completed in 2 minutes 46 seconds

in contrast to

    buildPhase completed in 5 minutes 22 seconds

before on the same machine (Hetzner AX41 NVMe with
AMD Ryzen 5 3600 6-Core Processor and 64GiB RAM).

Downside of that is that no tests are now executed, but I'm inclined to
make that sacrifice for now. Especially considering that a fix for that
is on the horizon with #284568.
2024-03-15 17:42:02 +01:00
R. Ryantm
bc3f515b51 grafana: 10.3.3 -> 10.3.4 2024-03-07 10:00:07 +00:00
R. Ryantm
1303e3e066 grafana: 10.3.1 -> 10.3.3 2024-02-14 09:14:20 +00:00
Peder Bergebakken Sundt
68dd75315c treewide: add system to "Unsupported system" throws 2024-02-11 00:03:49 +01:00
K900
4ed50a508c grafana: download more ram 2024-01-28 16:56:01 +03:00
K900
905bcfabe1 grafana: fix frontend build on aarch64
I think it works on x86_64 because it fallback to the prebuilt version and they only added prebuilt ARM binaries in 2.2.0 062bca4887
- @tgerbet
2024-01-28 15:36:21 +03:00
Maximilian Bosch
4787b13af9
grafana: ensure that final derivation doesn't depend on yarn cache
This saves 350M of runtime closure size.
Also move the patching part of the offline cache into the patch phase.
2024-01-23 23:10:52 +01:00
Maximilian Bosch
b1c52266c2
grafana: 10.2.3 -> 10.3.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.3.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.3.1
2024-01-23 18:16:45 +01:00
Maximilian Bosch
608db26178
grafana: build frontend from source
Up until now, the frontend was taken from `srcStatic`, i.e. prebuilt
from upstream. I recall at least three cases[1][2][3] where we got a hash
mismatch eventually.

Rather than spending time finding out whether or not it's a supply-chain
attack or just a build issue, I decided to implement a source-build now
with the following benefits:

* It's now actually possible to apply patches for Grafana's frontend.
* We rely a little less on third-party build systems.

Of course, patching potential vulnerabilities in transitive frontend
dependencies is still hard (let alone discovering that this package is
affected!), but that's a fundamental issue we have in nixpkgs and I
won't invent a half-baked solution just for this package, I still
consider this a step into the right direction.

The build itself mainly orients on the `yarn` commands used in the
upstream Makefile[4]. However, we can't use `fetchYarnDeps` here because
yarn v2 (a.k.a. `berry`) is in use which is why the same was done as in
`hedgedoc`, writing a custom FoD that downloads all dependencies and
writes the offline cache into `$out`[5].

Additionally there are two more notable differences to upstream:

* We patch out every dependency to `@grafana/e2e` and `cypress`. The
  first is a dependency on the latter in another version and the latter
  downloads random blobs from the Internet in postInstall. Since it's a
  testing framework (and the `e2e` package apparently a testing
  library), I decided it's not worth the effort and patched it out
  everywhere.

* There was a `zoneinfo.zip` in `$out/share/grafana/tools` that was
  installed from `srcStatic`. This only seems to be used on Windows[6]
  and that's not supported by this package, so I decided to drop it.

[1] https://github.com/NixOS/nixpkgs/pull/251479
[2] https://github.com/NixOS/nixpkgs/pull/130201
[3] https://github.com/NixOS/nixpkgs/pull/104794
[4] https://github.com/grafana/grafana/blob/v10.3.1/Makefile
[5] https://github.com/NixOS/nixpkgs/pull/245170
[6] https://github.com/grafana/grafana/blob/v10.3.1/pkg/setting/setting.go#L1012-L1014
2024-01-23 18:16:44 +01:00
Maximilian Bosch
3eb45a22ca
grafana: 10.2.2 -> 10.2.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.2.3

Changed `preBuild` to `postConfigure` since the latter is a hook that's
only executed in the actual build, not in the gomod FoD. This is a dirty
hack because apparently the removal of `pkg/util/xorm/go.{mod,sum}`
breaks the module download now, but not removing it breaks the build
later (as documented in the comment above).

A nice side-effect is that we don't do all the `go generate`/`wire`
invocations twice per build.
2023-12-20 17:47:29 +01:00
Maximilian Bosch
cfe12c16b7
Merge pull request #271950 from SuperSandro2000/grafana
grafana: 10.2.0 -> 10.2.2
2023-12-04 16:35:18 +01:00
Sandro Jäckel
5286ff070a
grafana: 10.2.0 -> 10.2.2 2023-12-04 00:43:38 +01:00
Thomas Gerbet
eac9180f29
Merge pull request #264685 from Ma27/grafana-tests
grafana: skip two more flaky tests
2023-12-03 12:34:54 +01:00
Adam Joseph
c7e0f6b905 treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
Maximilian Bosch
330d2db19f
grafana: skip two more flaky tests
See https://logs.ofborg.org/?key=nixos/nixpkgs.263185&attempt_id=5b056a17-67a7-4b74-9dc7-888eb1d6c2dd

Can neither be reproduced locally nor by our Hydra, so it seems very flaky.

Also there's quite a bunch of stuff that's skipped now, so I decided to
move this into a helper which makes it slightly clearer what's
happening in contrast to all the `sed(1)` dances.
2023-10-31 23:58:51 +01:00
Maximilian Bosch
68f42d70de
grafana: 10.1.5 -> 10.2.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.2.0
2023-10-24 18:12:50 +02:00
Luke Granger-Brown
cfa9514f78
Merge pull request #260979 from lukegb/grafana
grafanaPlugins: updates
2023-10-15 21:24:29 +01:00
Luke Granger-Brown
83021be1ec grafanaPlugins.redis-datasource: 2.1.1 -> 2.2.0 2023-10-14 02:08:20 +00:00
Luke Granger-Brown
0f08edda05 grafanaPlugins.grafana-worldmap-panel: 1.0.3 -> 1.0.6 2023-10-14 02:08:04 +00:00
Luke Granger-Brown
62d4c67908 grafanaPlugins.grafana-polystat-panel: 2.0.4 -> 2.1.4 2023-10-14 02:07:46 +00:00
Luke Granger-Brown
f380b578a3 grafanaPlugins.grafana-clock-panel: 2.1.2 -> 2.1.3 2023-10-14 02:07:28 +00:00
Luke Granger-Brown
f0b753203f grafanaPlugins.grafana-clickhouse-datasource: 3.1.0 -> 3.3.0 2023-10-14 02:07:10 +00:00
Maximilian Bosch
dc14787542
grafana: 10.1.1 -> 10.1.5
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.1.4
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.1.5

10.1.3 doesn't seem to exist and 10.1.2 only changed the docker images.
2023-10-13 23:11:37 +02:00
Weijia Wang
dd52d0fc96 grafana: fix update script 2023-09-21 23:47:30 +02:00
Maximilian Bosch
8a866283bc
grafana: 10.1.0 -> 10.1.1
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.1.1
2023-09-01 15:24:17 +02:00
Ivan Petkov
3419dfe5ce
grafana: fix srcStatic hash 2023-08-25 16:38:26 -07:00
Maximilian Bosch
bff4a3526b
grafana: 10.0.3 -> 10.1.0 (#251138)
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.1.0
2023-08-24 14:22:02 +02:00
WilliButz
676cef5717
grafana: 10.0.2 -> 10.0.3 (#246616)
https://github.com/grafana/grafana/releases/tag/v10.0.3
2023-08-01 21:46:24 +02:00
Jan Tojnar
cea188cbbb Merge branch 'staging-next' into staging
Conflicts:
 - pkgs/tools/networking/shadowfox/default.nix between e989daa65f and 1c29673fcc
 - pkgs/tools/networking/wuzz/default.nix between 7d80417710 and 1c29673fcc
2023-07-16 02:20:49 +02:00
Maximilian Bosch
9a4e941262
grafana: 10.0.1 -> 10.0.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.2
2023-07-14 13:49:01 +02:00
Artturin
1c29673fcc treewide: go-modules -> goModules
In 787af0f79f
I had to change ${go-modules} to $goModules to allow overrideAttrs to work;
However, env vars cannot contain -, so  i had to change go-modules too.
This in turn broke nix-update because it uses the go-modules attr.

Instead of making nix-update more complicated, make go-modules naming match cargoDeps.

`fd --type f | xargs sd '\bgo-modules\b' 'goModules'`
and revert change to pkgs/applications/misc/dstask/default.nix
and pkgs/servers/http/dave/default.nix
and pkgs/os-specific/darwin/plistwatch/default.nix

release note added
2023-07-14 00:18:06 +03:00
Maximilian Bosch
aba5c5bc2c
grafana: 9.5.3 -> 10.0.1
https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v10-0/

ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.0-preview
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.1

Also fixes CVE-2023-3128, see
https://grafana.com/blog/2023/06/22/grafana-security-release-for-cve-2023-3128/?pg=graf&plcmt=top-promo-banner
2023-06-23 13:13:31 +02:00
Yureka
96ce8d5964
grafanaPlugins.grafanaPlugin: add platform only when multiple zipHash are specified (#237513) 2023-06-13 11:10:28 +02:00
Jacob Moody
7005cdfa52 grafanaPlugins.grafana-clickhouse-datasource: init at 3.1.0 2023-06-13 10:27:44 +02:00
Maximilian Bosch
08139a7626
grafana: 9.5.2 -> 9.5.3
Fixes CVE-2023-2801 & CVE-2023-2183

ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.5.3
Security advisory: https://grafana.com/blog/2023/06/06/grafana-security-release-new-grafana-versions-with-security-fixes-for-cve-2023-2183-and-cve-2023-2801/
2023-06-08 14:00:36 +02:00
Maximilian Bosch
99fa6cd0b2
grafana: 9.5.1 -> 9.5.2
ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.5.2
2023-05-11 11:41:38 +02:00
Thomas Gerbet
19a929866c grafana: 9.4.7 -> 9.5.1
Fixes CVE-2023-1387 and pull fixed dependency for CVE-2023-28119.

Release notes:
https://grafana.com/blog/2023/04/26/grafana-9.5-release/

Security advisory:
https://grafana.com/blog/2023/04/26/grafana-security-release-new-versions-of-grafana-with-security-fixes-for-cve-2023-28119-and-cve-2023-1387/
2023-04-27 14:49:53 +02:00
Vladimír Čunát
f3ec120882
grafana: fix a test by upstream patch 2023-04-15 14:40:07 +02:00
Vladimír Čunát
86ce1865b6
Revert "grafana: skip a test that started failing"
This reverts commit cdefbd2eb0.
Let's fix the test instead.
2023-04-15 14:39:54 +02:00
Vladimír Čunát
cdefbd2eb0
grafana: skip a test that started failing
It's weird but this single test started failing in this staging-next
iteration, on all four 64-bit platforms.
I thought this will be better than not having any grafana,
as it's only a single test and our .tests still build.
2023-04-12 12:28:06 +02:00